public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/chromium] epel10.2: Update to 153.0.8010.36
@ 2026-09-16 14:35 Than Ngo
  0 siblings, 0 replies; only message in thread
From: Than Ngo @ 2026-09-16 14:35 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/chromium
Branch : epel10.2
Commit : 10433421da279c0c1e503edda2da6ea8da7282a1
Author : Than Ngo <than@redhat.com>
Date   : 2026-09-14T21:13:20+02:00
Stats  : +31826/-30531 in 13 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/10433421da279c0c1e503edda2da6ea8da7282a1?branch=epel10.2

Log:
Update to 153.0.8010.36

---
diff --git a/0002-Add-ppc64-trap-instructions.patch b/0002-Add-ppc64-trap-instructions.patch
deleted file mode 100644
index 9559580..0000000
--- a/0002-Add-ppc64-trap-instructions.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: chromium-144.0.7559.59/v8/src/base/immediate-crash.h
-===================================================================
---- chromium-144.0.7559.59.orig/v8/src/base/immediate-crash.h
-+++ chromium-144.0.7559.59/v8/src/base/immediate-crash.h
-@@ -98,6 +98,13 @@
- #define TRAP_SEQUENCE1_() asm volatile(".2byte 0x0001");
- #define TRAP_SEQUENCE2_() asm volatile("")
- 
-+#elif V8_HOST_ARCH_PPC64
-+
-+#define TRAP_SEQUENCE1_() asm volatile("trap")
-+// Intentionally empty: __builtin_unreachable() is always part of the sequence
-+// (see IMMEDIATE_CRASH below)
-+#define TRAP_SEQUENCE2_() asm volatile("")
-+
- #else
- 
- // Crash report accuracy will not be guaranteed on other architectures, but at

diff --git a/0002-regenerate-xnn-buildgn.patch b/0002-regenerate-xnn-buildgn.patch
index bd90d0d..b4e6962 100644
--- a/0002-regenerate-xnn-buildgn.patch
+++ b/0002-regenerate-xnn-buildgn.patch
@@ -7,10 +7,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-152.0.7977.64/third_party/xnnpack/BUILD.gn
+Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 ===================================================================
---- chromium-152.0.7977.64.orig/third_party/xnnpack/BUILD.gn
-+++ chromium-152.0.7977.64/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
 @@ -34,10 +34,10 @@ config("xnnpack_public_config") {
    }
  
@@ -26,7 +26,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  }
  
  config("xnnpack_private_config") {
-@@ -48,2140 +48,2438 @@ config("xnnpack_private_config") {
+@@ -48,2160 +48,2452 @@ config("xnnpack_private_config") {
    ]
  }
  
@@ -45,6 +45,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ":configs_x64",
 +    ":enums_x64",
 +    ":f16-avgpool_f16c-no-avx2-no-fma",
++    ":f16-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 +    ":f16-dwconv_f16c-fma-no-avx2",
 +    ":f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma",
 +    ":f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
@@ -86,6 +87,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ":f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 +    ":f16-vbinary_f16c-no-avx2-no-fma",
 +    ":f16-vclamp_f16c-no-avx2-no-fma",
++    ":f16-vcos_avx512f",
++    ":f16-vcos_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
++    ":f16-vcos_f16c-no-avx2-no-fma",
 +    ":f16-vcos_x64",
 +    ":f16-velu_f16c-fma-avx2",
 +    ":f16-vexp_avx512f",
@@ -103,6 +107,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ":f16-vrnd_f16c-no-avx2-no-fma",
 +    ":f16-vrsqrt_f16c-no-avx2-no-fma",
 +    ":f16-vsigmoid_f16c-fma-avx2",
++    ":f16-vsin_avx512f",
++    ":f16-vsin_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
++    ":f16-vsin_f16c-no-avx2-no-fma",
 +    ":f16-vsin_x64",
 +    ":f16-vsqrt_f16c-no-avx2-no-fma",
 +    ":f16-vsqrt_x64",
@@ -615,6 +622,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ":configs_x64_standalone",
 +    ":enums_x64_standalone",
 +    ":f16-avgpool_f16c-no-avx2-no-fma_standalone",
++    ":f16-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
 +    ":f16-dwconv_f16c-fma-no-avx2_standalone",
 +    ":f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone",
 +    ":f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
@@ -656,6 +664,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ":f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
 +    ":f16-vbinary_f16c-no-avx2-no-fma_standalone",
 +    ":f16-vclamp_f16c-no-avx2-no-fma_standalone",
++    ":f16-vcos_avx512f_standalone",
++    ":f16-vcos_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
++    ":f16-vcos_f16c-no-avx2-no-fma_standalone",
 +    ":f16-vcos_x64_standalone",
 +    ":f16-velu_f16c-fma-avx2_standalone",
 +    ":f16-vexp_avx512f_standalone",
@@ -673,6 +684,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ":f16-vrnd_f16c-no-avx2-no-fma_standalone",
 +    ":f16-vrsqrt_f16c-no-avx2-no-fma_standalone",
 +    ":f16-vsigmoid_f16c-fma-avx2_standalone",
++    ":f16-vsin_avx512f_standalone",
++    ":f16-vsin_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
++    ":f16-vsin_f16c-no-avx2-no-fma_standalone",
 +    ":f16-vsin_x64_standalone",
 +    ":f16-vsqrt_f16c-no-avx2-no-fma_standalone",
 +    ":f16-vsqrt_x64_standalone",
@@ -1187,6 +1201,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ":configs_x64",
 -      ":enums_x64",
 -      ":f16-avgpool_f16c-no-avx2-no-fma",
+-      ":f16-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 -      ":f16-dwconv_f16c-fma-no-avx2",
 -      ":f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma",
 -      ":f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
@@ -1228,6 +1243,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ":f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 -      ":f16-vbinary_f16c-no-avx2-no-fma",
 -      ":f16-vclamp_f16c-no-avx2-no-fma",
+-      ":f16-vcos_avx512f",
+-      ":f16-vcos_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
+-      ":f16-vcos_f16c-no-avx2-no-fma",
 -      ":f16-vcos_x64",
 -      ":f16-velu_f16c-fma-avx2",
 -      ":f16-vexp_avx512f",
@@ -1245,6 +1263,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ":f16-vrnd_f16c-no-avx2-no-fma",
 -      ":f16-vrsqrt_f16c-no-avx2-no-fma",
 -      ":f16-vsigmoid_f16c-fma-avx2",
+-      ":f16-vsin_avx512f",
+-      ":f16-vsin_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
+-      ":f16-vsin_f16c-no-avx2-no-fma",
 -      ":f16-vsin_x64",
 -      ":f16-vsqrt_f16c-no-avx2-no-fma",
 -      ":f16-vsqrt_x64",
@@ -1529,6 +1550,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ":qs8-qc4w-packw_avx2-avxvnni-f16c-fma-gfni",
 -      ":qs8-qc4w-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni",
 -      ":qs8-qc4w-packw_sse2-no-sse3",
+-      ":qs8-qc4w-packw_x64",
 -      ":qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma",
 -      ":qs8-qc8w-dwconv_f16c-fma-avx2",
 -      ":qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
@@ -1996,6 +2018,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ":configs_x64_standalone",
 -      ":enums_x64_standalone",
 -      ":f16-avgpool_f16c-no-avx2-no-fma_standalone",
+-      ":f16-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
 -      ":f16-dwconv_f16c-fma-no-avx2_standalone",
 -      ":f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone",
 -      ":f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
@@ -2037,6 +2060,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ":f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
 -      ":f16-vbinary_f16c-no-avx2-no-fma_standalone",
 -      ":f16-vclamp_f16c-no-avx2-no-fma_standalone",
+-      ":f16-vcos_avx512f_standalone",
+-      ":f16-vcos_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
+-      ":f16-vcos_f16c-no-avx2-no-fma_standalone",
 -      ":f16-vcos_x64_standalone",
 -      ":f16-velu_f16c-fma-avx2_standalone",
 -      ":f16-vexp_avx512f_standalone",
@@ -2054,6 +2080,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ":f16-vrnd_f16c-no-avx2-no-fma_standalone",
 -      ":f16-vrsqrt_f16c-no-avx2-no-fma_standalone",
 -      ":f16-vsigmoid_f16c-fma-avx2_standalone",
+-      ":f16-vsin_avx512f_standalone",
+-      ":f16-vsin_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
+-      ":f16-vsin_f16c-no-avx2-no-fma_standalone",
 -      ":f16-vsin_x64_standalone",
 -      ":f16-vsqrt_f16c-no-avx2-no-fma_standalone",
 -      ":f16-vsqrt_x64_standalone",
@@ -2338,6 +2367,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ":qs8-qc4w-packw_avx2-avxvnni-f16c-fma-gfni_standalone",
 -      ":qs8-qc4w-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone",
 -      ":qs8-qc4w-packw_sse2-no-sse3_standalone",
+-      ":qs8-qc4w-packw_x64_standalone",
 -      ":qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma_standalone",
 -      ":qs8-qc8w-dwconv_f16c-fma-avx2_standalone",
 -      ":qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
@@ -2965,6 +2995,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ":qs8-qc2w-gemm_arm64",
 -      ":qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod",
 -      ":qs8-qc4w-gemm_arm64",
+-      ":qs8-qc4w-packw_arm64",
 -      ":qs8-qc8w-dwconv_arm64",
 -      ":qs8-qc8w-gemm_arch=armv8.2-a+dotprod",
 -      ":qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod",
@@ -3460,6 +3491,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ":qs8-qc2w-gemm_arm64_standalone",
 -      ":qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod_standalone",
 -      ":qs8-qc4w-gemm_arm64_standalone",
+-      ":qs8-qc4w-packw_arm64_standalone",
 -      ":qs8-qc8w-dwconv_arm64_standalone",
 -      ":qs8-qc8w-gemm_arch=armv8.2-a+dotprod_standalone",
 -      ":qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone",
@@ -3948,6 +3980,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ":qs8-packw_riscv64",
 -      ":qs8-qc2w-gemm_riscv64",
 -      ":qs8-qc4w-gemm_riscv64",
+-      ":qs8-qc4w-packw_riscv64",
 -      ":qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d",
 -      ":qs8-qc8w-dwconv_riscv64",
 -      ":qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d",
@@ -4340,6 +4373,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ":qs8-packw_riscv64_standalone",
 -      ":qs8-qc2w-gemm_riscv64_standalone",
 -      ":qs8-qc4w-gemm_riscv64_standalone",
+-      ":qs8-qc4w-packw_riscv64_standalone",
 -      ":qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone",
 -      ":qs8-qc8w-dwconv_riscv64_standalone",
 -      ":qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone",
@@ -4573,7 +4607,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
      ]
    }
  } else {
-@@ -2191,6 +2489,7 @@ if (current_cpu == "x64" || current_cpu
+@@ -2211,6 +2503,7 @@ if (current_cpu == "x64" || current_cpu
    }
  }
  
@@ -4581,7 +4615,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  if (build_with_chromium) {
    source_set("xnnpack") {
      public = [ "src/include/xnnpack.h" ]
-@@ -2201,39 +2500,39 @@ if (build_with_chromium) {
+@@ -2221,39 +2514,39 @@ if (build_with_chromium) {
      configs += [ ":xnnpack_private_config" ]
  
      sources = [
@@ -4650,7 +4684,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
      public_configs = [ ":xnnpack_public_config" ]
    }
-@@ -2250,39 +2549,39 @@ if (build_with_internal_optimization_gui
+@@ -2270,39 +2563,39 @@ if (build_with_internal_optimization_gui
      configs += [ ":xnnpack_private_config" ]
  
      sources = [
@@ -4719,7 +4753,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
      public_configs = [ ":xnnpack_public_config" ]
  
-@@ -2293,65753 +2592,76480 @@ if (build_with_internal_optimization_gui
+@@ -2313,66399 +2606,76963 @@ if (build_with_internal_optimization_gui
  }
  
  if (current_cpu == "x64" || current_cpu == "x86") {
@@ -5190,6 +5224,16 @@ Index: chromium-152.0.7977.64/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") {
@@ -5208,19 +5252,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-avx512skx-u128.c"
 +    ]
  
--      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",
 -      ]
 +    configs -= [ "//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",
@@ -5228,35 +5273,11 @@ Index: chromium-152.0.7977.64/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-qu8-vcvt_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("bf16-qs8-vcvt_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -5280,40 +5301,24 @@ Index: chromium-152.0.7977.64/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("bf16-rminmax_x64") {
 -      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",
 -      ]
-+    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-qs8-vcvt_x64_standalone") {
++if (build_with_chromium) {
++  source_set("bf16-qs8-vcvt_x64") {
 +    cflags = [
 +  
 +    ]
@@ -5323,32 +5328,49 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "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" ]
+-      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("bf16-rminmax_x64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("bf16-qs8-vcvt_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -5374,16 +5396,23 @@ Index: chromium-152.0.7977.64/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("configs_x64") {
 -      cflags = []
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/configs/argmaxpool-config.c",
@@ -5423,42 +5452,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("bf16-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-avx512skx-u128.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("configs_x64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/configs/argmaxpool-config.c",
@@ -5505,12 +5512,68 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
++if (build_with_chromium) {
++  source_set("bf16-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-avx512skx-u128.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("enums_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/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",
+-      ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("enums_x64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("enums_x64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -5548,16 +5611,45 @@ Index: chromium-152.0.7977.64/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-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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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",
@@ -5565,19 +5657,23 @@ Index: chromium-152.0.7977.64/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("enums_x64_standalone") {
--      cflags = []
+-      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") {
+-      cflags = [
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
+-      ]
+-
 -      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-avgpool-9p-minmax-f16c.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -5604,16 +5700,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-avgpool_f16c-no-avx2-no-fma") {
+-    source_set(
+-        "f16-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-25p32c-minmax-avx512fp16-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-9p32c-minmax-avx512fp16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -5648,16 +5753,25 @@ Index: chromium-152.0.7977.64/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-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-25p32c-minmax-avx512fp16-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-9p32c-minmax-avx512fp16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6279,21 +6393,7 @@ Index: chromium-152.0.7977.64/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("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"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
@@ -6318,10 +6418,20 @@ Index: chromium-152.0.7977.64/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("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"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-f32acc-gemm_f16c-fma-avx2") {
@@ -6348,6 +6458,14 @@ Index: chromium-152.0.7977.64/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",
@@ -6355,12 +6473,6 @@ Index: chromium-152.0.7977.64/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") {
@@ -6394,22 +6506,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        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",
-+    "src/src/enums/node-type.c",
-+    "src/src/enums/operator-type.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -6441,20 +6540,29 @@ Index: chromium-152.0.7977.64/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("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" ]
 -    }
 -  }
-+    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) {
@@ -6493,13 +6601,14 @@ Index: chromium-152.0.7977.64/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" ]
-     }
-   }
-+}
+-    }
+-  }
++    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") {
@@ -6526,26 +6635,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+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"
-+    ]
++    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) {
@@ -6580,16 +6677,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
+-  }
++if (build_with_chromium) {
++  source_set("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"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -6621,28 +6721,21 @@ Index: chromium-152.0.7977.64/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-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"
-+    ]
- 
--      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(
@@ -6681,13 +6774,9 @@ Index: chromium-152.0.7977.64/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(
@@ -6718,14 +6807,27 @@ Index: chromium-152.0.7977.64/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-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"
++    ]
  
 -      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) {
@@ -6765,20 +6867,11 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f16-dwconv_f16c-fma-no-avx2") {
-+    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-fma3-acc2.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-fma3.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-fma3.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-fma3.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  if (build_with_chromium) {
@@ -6805,20 +6898,14 @@ Index: chromium-152.0.7977.64/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) {
@@ -6852,9 +6939,27 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++if (build_with_chromium) {
++  source_set("f16-dwconv_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-dwconv/gen/f16-dwconv-25p32c-minmax-avx512fp16-acc2.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p32c-minmax-avx512fp16.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -6885,31 +6990,21 @@ Index: chromium-152.0.7977.64/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-dwconv_f16c-fma-no-avx2_standalone") {
-+    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-fma3-acc2.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-fma3.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-fma3.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-fma3.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(
@@ -6947,13 +7042,9 @@ Index: chromium-152.0.7977.64/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("f16-f32acc-rdsum_f16c-no-avx2-no-fma") {
@@ -6979,14 +7070,35 @@ Index: chromium-152.0.7977.64/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-dwconv_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-dwconv/gen/f16-dwconv-25p32c-minmax-avx512fp16-acc2.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p32c-minmax-avx512fp16.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) {
@@ -7021,18 +7133,11 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+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"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  if (build_with_chromium) {
@@ -7064,20 +7169,14 @@ Index: chromium-152.0.7977.64/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) {
@@ -7116,9 +7215,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++if (build_with_chromium) {
++  source_set("f16-dwconv_f16c-fma-no-avx2") {
++    cflags = [
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-fma3-acc2.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-fma3.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-fma3.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-fma3.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma") {
@@ -7144,29 +7256,21 @@ Index: chromium-152.0.7977.64/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_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" ]
--    }
--  }
 +    configs -= [ "//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-rsum2_f16c-no-avx2-no-fma_standalone") {
@@ -7199,13 +7303,9 @@ Index: chromium-152.0.7977.64/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(
@@ -7236,14 +7336,30 @@ Index: chromium-152.0.7977.64/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-dwconv_f16c-fma-no-avx2_standalone") {
++    cflags = [
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-fma3-acc2.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-fma3.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-fma3.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-fma3.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) {
@@ -7283,21 +7399,11 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+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"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  if (build_with_chromium) {
@@ -7324,20 +7430,14 @@ Index: chromium-152.0.7977.64/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) {
@@ -7371,9 +7471,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++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(
@@ -7408,32 +7519,21 @@ Index: chromium-152.0.7977.64/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_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"
-+    ]
- 
--      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(
@@ -7475,13 +7575,9 @@ Index: chromium-152.0.7977.64/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("f16-ibilinear_f16c-fma-no-avx2") {
@@ -7507,14 +7603,28 @@ Index: chromium-152.0.7977.64/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_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" ]
-+    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) {
@@ -7549,17 +7659,11 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+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"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  if (build_with_chromium) {
@@ -7595,20 +7699,14 @@ Index: chromium-152.0.7977.64/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) {
@@ -7651,9 +7749,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_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("f16-maxpool_f16c-fma-avx2") {
@@ -7679,28 +7791,21 @@ Index: chromium-152.0.7977.64/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_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"
-+    ]
- 
--      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-maxpool_f16c-fma-avx2_standalone") {
@@ -7733,13 +7838,9 @@ Index: chromium-152.0.7977.64/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("f16-maxpool_sse4.1-no-sse4.2") {
@@ -7764,14 +7865,27 @@ Index: chromium-152.0.7977.64/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("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"
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -7805,17 +7919,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+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"
-+    ]
++    configs -= [ "//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(
@@ -7846,21 +7953,18 @@ Index: chromium-152.0.7977.64/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(
@@ -7897,46 +8001,41 @@ Index: chromium-152.0.7977.64/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-qs8-vcvt_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") {
+-
+-      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") {
 +    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"
 +    ]
  
--      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",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -7944,12 +8043,16 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
  
@@ -7957,7 +8060,20 @@ Index: chromium-152.0.7977.64/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",
@@ -7982,17 +8098,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+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"
-+    ]
++    configs -= [ "//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(
@@ -8023,21 +8132,18 @@ Index: chromium-152.0.7977.64/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(
@@ -8074,46 +8180,40 @@ Index: chromium-152.0.7977.64/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-qu8-vcvt_x64") {
 -      cflags = []
-+# 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") {
+-
+-      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") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse41-int16-u16.c"
++      "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",
--      ]
-+    configs -= [ "//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",
@@ -8121,12 +8221,16 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
  
@@ -8134,7 +8238,19 @@ Index: chromium-152.0.7977.64/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",
@@ -8159,16 +8275,10 @@ Index: chromium-152.0.7977.64/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"
-+    ]
++    configs -= [ "//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-raddstoreexpminusmax_f16c-fma-avx2") {
@@ -8194,21 +8304,18 @@ Index: chromium-152.0.7977.64/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-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
@@ -8240,67 +8347,64 @@ Index: chromium-152.0.7977.64/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-rdminmax_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_x64_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-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",
 -      ]
-+    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"
++    ]
  
 -      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("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",
@@ -8325,20 +8429,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+if (build_with_chromium) {
-+  source_set("f16-f32acc-gemm_f16c-fma-avx2") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-1x16-minmax-avx2-broadcast.c",
-+    "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-4x16-minmax-avx2-broadcast.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -8371,20 +8464,26 @@ Index: chromium-152.0.7977.64/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_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" ]
 -    }
 -  }
-+    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) {
@@ -8425,9 +8524,13 @@ Index: chromium-152.0.7977.64/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(
@@ -8463,28 +8566,14 @@ Index: chromium-152.0.7977.64/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-f32acc-gemm_f16c-fma-avx2_standalone") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-1x16-minmax-avx2-broadcast.c",
-+    "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-4x16-minmax-avx2-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" ]
++    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) {
@@ -8529,11 +8618,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++if (build_with_chromium) {
++  source_set("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) {
@@ -8560,14 +8653,20 @@ Index: chromium-152.0.7977.64/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) {
@@ -8601,71 +8700,35 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+if (build_with_chromium) {
-+  source_set("f16-f32acc-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-1x32-minmax-avx512skx-broadcast.c",
-+    "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-4x32-minmax-avx512skx-broadcast.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  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" ]
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-f32-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-1x32-minmax-avx512skx-broadcast.c",
-+    "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-4x32-minmax-avx512skx-broadcast.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -8734,7 +8797,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-avx512f-rational-6-4-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-igemm_f16c-fma-avx2") {
++  source_set("f16-f32acc-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -8743,8 +8806,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-1x16-minmax-avx2-broadcast.c",
++    "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-4x16-minmax-avx2-broadcast.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -8781,7 +8844,7 @@ Index: chromium-152.0.7977.64/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-igemm_f16c-fma-avx2_standalone") {
++  source_set("f16-f32acc-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -8790,8 +8853,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-1x16-minmax-avx2-broadcast.c",
++    "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-4x16-minmax-avx2-broadcast.c"
 +    ]
  
 -      sources = [
@@ -8937,7 +9000,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-f32acc-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -8950,8 +9013,8 @@ Index: chromium-152.0.7977.64/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-gemm/gen/f16-f32acc-gemm-1x32-minmax-avx512skx-broadcast.c",
++    "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-4x32-minmax-avx512skx-broadcast.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -9010,7 +9073,7 @@ Index: chromium-152.0.7977.64/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-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-f32acc-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -9023,8 +9086,8 @@ Index: chromium-152.0.7977.64/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-gemm/gen/f16-f32acc-gemm-1x32-minmax-avx512skx-broadcast.c",
++    "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-4x32-minmax-avx512skx-broadcast.c"
 +    ]
  
 -      sources = [
@@ -9092,20 +9155,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-f32acc-igemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    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-1x16-minmax-avx2-broadcast.c",
++    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -9283,20 +9343,17 @@ Index: chromium-152.0.7977.64/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") {
++  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-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.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"
 +    ]
  
 -  # This is a target that cannot depend on //base.
@@ -9429,184 +9486,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vcos_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c",
--      ]
-+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" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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("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-vcos-scalar-rational-3-2-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("f16-velu_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-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("f16-velu_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-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("f16-vexp_avx512f") {
+-    source_set("f16-vcos_avx512f") {
 -      cflags = [ "-mavx512f" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-f32acc-vexp-avx512f-poly-3.c",
+-        "src/src/f16-vcos/gen/f16-f32acc-vcos-avx512f-poly-3.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -9619,7 +9507,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.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" ]
@@ -9652,11 +9541,11 @@ Index: chromium-152.0.7977.64/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-vcos_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +# 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-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -9669,12 +9558,13 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.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"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-f32acc-vexp-avx512f-poly-3.c",
+-        "src/src/f16-vcos/gen/f16-f32acc-vcos-avx512f-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9703,7 +9593,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -  if (build_with_chromium) {
 -    source_set(
--        "f16-vexp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
+-        "f16-vcos_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 -      cflags = [
 -        "-mavx512bw",
 -        "-mavx512cd",
@@ -9719,7 +9609,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-vexp-avx512fp16-poly-3.c",
+-        "src/src/f16-vcos/gen/f16-vcos-avx512fp16-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9748,7 +9638,7 @@ Index: chromium-152.0.7977.64/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") {
+-        "f16-vcos_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 -      cflags = [
 -        "-mavx512bw",
 -        "-mavx512cd",
@@ -9764,7 +9654,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-vexp-avx512fp16-poly-3.c",
+-        "src/src/f16-vcos/gen/f16-vcos-avx512fp16-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9791,7 +9681,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vexp_f16c-no-avx2-no-fma") {
+-    source_set("f16-vcos_f16c-no-avx2-no-fma") {
 -      cflags = [
 -        "-mf16c",
 -        "-mno-avx2",
@@ -9800,7 +9690,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-f32acc-vexp-f16c-poly-3.c",
+-        "src/src/f16-vcos/gen/f16-f32acc-vcos-f16c-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9815,16 +9705,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma") {
++  source_set("f16-f32acc-rdsum2_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-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -9837,7 +9731,7 @@ Index: chromium-152.0.7977.64/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-no-avx2-no-fma_standalone") {
+-    source_set("f16-vcos_f16c-no-avx2-no-fma_standalone") {
 -      cflags = [
 -        "-mf16c",
 -        "-mno-avx2",
@@ -9846,7 +9740,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-f32acc-vexp-f16c-poly-3.c",
+-        "src/src/f16-vcos/gen/f16-f32acc-vcos-f16c-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9879,25 +9773,29 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vexp_x64") {
+-    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-rdsum_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-f32acc-rdsum2_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-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c",
+-        "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" ]
@@ -9932,10 +9830,179 @@ Index: chromium-152.0.7977.64/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-vcos_x64_standalone") {
 -      cflags = []
+-
+-      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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  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"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-velu_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-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("f16-velu_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-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("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") {
++    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-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",
++    ]
+ 
+-      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-vexp_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
++if (build_with_chromium) {
++  source_set("f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -9948,12 +10015,12 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-avx512skx-u64.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c",
+-        "src/src/f16-vexp/gen/f16-f32acc-vexp-avx512f-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9981,8 +10048,37 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vgelu_x64") {
--      cflags = []
+-    source_set(
+-        "f16-vexp_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-vexp/gen/f16-vexp-avx512fp16-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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -9990,21 +10086,56 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
--      ]
+-      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-vexp_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-vexp/gen/f16-vexp-avx512fp16-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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -10017,9 +10148,27 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-avx512skx-u64.c"
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("f16-vexp_f16c-no-avx2-no-fma") {
+-      cflags = [
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vexp/gen/f16-f32acc-vexp-f16c-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" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -10043,13 +10192,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -  # 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" ]
- 
+-    source_set("f16-vexp_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-vexp/gen/f16-f32acc-vexp-f16c-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -10069,6 +10221,8 @@ Index: chromium-152.0.7977.64/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" ]
      }
@@ -10076,16 +10230,12 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vhswish_f16c-no-avx2-no-fma") {
--      cflags = [
--        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
--      ]
+-    source_set("f16-vexp_x64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c",
+-        "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -10100,7 +10250,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma") {
++  source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -10109,7 +10259,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -10122,16 +10272,102 @@ Index: chromium-152.0.7977.64/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") {
--      cflags = [
--        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-    source_set("f16-vexp_x64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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-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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c",
+-        "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" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/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-vgelu_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -10152,13 +10388,95 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        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 (build_with_chromium) {
+-    source_set("f16-vhswish_f16c-no-avx2-no-fma") {
+-      cflags = [
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vhswish/gen/f16-vhswish-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" ]
+-
+-      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-vhswish_f16c-no-avx2-no-fma_standalone") {
+-      cflags = [
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vhswish/gen/f16-vhswish-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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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" ]
    }
 +}
@@ -10168,16 +10486,20 @@ Index: chromium-152.0.7977.64/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-no-avx2-no-fma_standalone") {
++  source_set("f16-f32acc-rsum2_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-rsum2/gen/f16-f32acc-rsum2-avx512skx.c"
 +    ]
  
 -      sources = [
@@ -10220,20 +10542,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vlog_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +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"
++      "-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-rsum2/gen/f16-f32acc-rsum2-f16c.c"
 +    ]
  
 -      sources = [
@@ -10353,20 +10671,16 @@ Index: chromium-152.0.7977.64/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"
++      "-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-rsum2/gen/f16-f32acc-rsum2-f16c.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -10456,16 +10770,20 @@ Index: chromium-152.0.7977.64/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-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-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" ]
@@ -10502,16 +10820,20 @@ Index: chromium-152.0.7977.64/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-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-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c"
 +    ]
  
 -      sources = [
@@ -10641,24 +10963,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +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"
++      "-mf16c",
++    "-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -10741,24 +11055,16 @@ Index: chromium-152.0.7977.64/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"
++      "-mf16c",
++    "-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -10879,16 +11185,24 @@ Index: chromium-152.0.7977.64/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 = [
-+      "-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-gemm/gen/f16-gemm-1x32-minmax-avx512fp16-broadcast.c",
++    "src/src/f16-gemm/gen/f16-gemm-8x32-minmax-avx512fp16-broadcast.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -10967,25 +11281,33 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vsin_x64") {
--      cflags = []
+-    source_set("f16-vsin_avx512f") {
+-      cflags = [ "-mavx512f" ]
 +# 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 = [
-+      "-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-gemm/gen/f16-gemm-1x32-minmax-avx512fp16-broadcast.c",
++    "src/src/f16-gemm/gen/f16-gemm-8x32-minmax-avx512fp16-broadcast.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f16-vsin/gen/f16-f32acc-vsin-avx512f-poly-3.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -11020,12 +11342,24 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vsin_x64_standalone") {
--      cflags = []
--
+-    source_set("f16-vsin_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
++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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f16-vsin/gen/f16-f32acc-vsin-avx512f-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11047,38 +11381,30 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f16-igemm_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-igemm/gen/f16-igemm-1x32-minmax-avx512fp16-broadcast.c",
-+    "src/src/f16-igemm/gen/f16-igemm-8x32-minmax-avx512fp16-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("f16-vsqrt_f16c-no-avx2-no-fma") {
+-    source_set(
+-        "f16-vsin_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c",
+-        "src/src/f16-vsin/gen/f16-vsin-avx512fp16-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11092,14 +11418,6 @@ Index: chromium-152.0.7977.64/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",
@@ -11107,18 +11425,32 @@ Index: chromium-152.0.7977.64/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-vsqrt_f16c-no-avx2-no-fma_standalone") {
+-    source_set(
+-        "f16-vsin_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c",
+-        "src/src/f16-vsin/gen/f16-vsin-avx512fp16-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11139,45 +11471,39 @@ Index: chromium-152.0.7977.64/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-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"
++    ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vsqrt_x64") {
--      cflags = []
+-    source_set("f16-vsin_f16c-no-avx2-no-fma") {
+-      cflags = [
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
+-        "src/src/f16-vsin/gen/f16-f32acc-vsin-f16c-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" ]
-+# 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") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
-+    ]
-+  
-+    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"
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -11201,13 +11527,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vsqrt_x64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-    source_set("f16-vsin_f16c-no-avx2-no-fma_standalone") {
+-      cflags = [
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
+-        "src/src/f16-vsin/gen/f16-f32acc-vsin-f16c-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11227,6 +11556,8 @@ Index: chromium-152.0.7977.64/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" ]
      }
@@ -11234,24 +11565,32 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vtanh_avx512f") {
--      cflags = [ "-mavx512f" ]
+-    source_set("f16-vsin_x64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c",
+-        "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_f16c-fma-avx2") {
++  source_set("f16-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11284,25 +11623,33 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vtanh_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
+-    source_set("f16-vsin_x64_standalone") {
+-      cflags = []
 +# 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-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c",
+-        "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11330,24 +11677,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set(
--        "f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
+-    source_set("f16-vsqrt_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-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11375,24 +11714,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -  # 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-vsqrt_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-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11419,16 +11750,12 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vtanh_f16c-no-avx2-no-fma") {
--      cflags = [
--        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
--      ]
+-    source_set("f16-vsqrt_x64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-f16c-rational-5-4-div.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11443,15 +11770,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_sse4.1-no-sse4.2") {
++  source_set("f16-maxpool_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -11464,16 +11792,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -  # 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") {
--      cflags = [
--        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
--      ]
--
+-    source_set("f16-vsqrt_x64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-f16c-rational-5-4-div.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11494,36 +11824,30 @@ Index: chromium-152.0.7977.64/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-vtanh_x64") {
--      cflags = []
+-    source_set("f16-vtanh_avx512f") {
+-      cflags = [ "-mavx512f" ]
 +# 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-maxpool_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c",
+-        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -11558,12 +11882,23 @@ Index: chromium-152.0.7977.64/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") {
--      cflags = []
--
+-    source_set("f16-vtanh_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
++if (build_with_chromium) {
++  source_set("f16-maxpool_sse4.1-no-sse4.2") {
++    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c",
+-        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11585,34 +11920,30 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f16-qs8-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-avx512skx-u128.c"
-+    ]
++    configs -= [ "//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-vunary_f16c-no-avx2-no-fma") {
+-    source_set(
+-        "f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11626,14 +11957,6 @@ Index: chromium-152.0.7977.64/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",
@@ -11641,18 +11964,32 @@ Index: chromium-152.0.7977.64/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-vunary_f16c-no-avx2-no-fma_standalone") {
+-    source_set(
+-        "f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11673,21 +12010,31 @@ Index: chromium-152.0.7977.64/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-maxpool_sse4.1-no-sse4.2_standalone") {
++    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
++    ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vunary_sse2-no-sse3") {
+-    source_set("f16-vtanh_f16c-no-avx2-no-fma") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      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/f16-vtanh/gen/f16-f32acc-vtanh-f16c-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11701,13 +12048,82 @@ Index: chromium-152.0.7977.64/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-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++    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-vtanh_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-f16c-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("f16-vtanh_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -11723,18 +12139,28 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "src/src/f16-qs8-vcvt/gen/f16-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("f16-vunary_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
+-    source_set("f16-vtanh_x64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      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/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11755,22 +12181,21 @@ Index: chromium-152.0.7977.64/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-argmaxpool_sse2-no-sse3") {
+-    source_set("f16-vunary_f16c-no-avx2-no-fma") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c",
+-        "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11784,29 +12209,44 @@ Index: chromium-152.0.7977.64/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-qs8-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-avx512skx-u128.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-argmaxpool_sse2-no-sse3_standalone") {
+-    source_set("f16-vunary_f16c-no-avx2-no-fma_standalone") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c",
+-        "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11826,20 +12266,81 @@ Index: chromium-152.0.7977.64/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-vunary_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("f32-argmaxpool_x64") {
--      cflags = []
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vunary_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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-qs8-vcvt_x64") {
 +    cflags = [
@@ -11851,21 +12352,37 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("f32-argmaxpool_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c",
+-      ]
+-
 -      configs -= [ "//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",
@@ -11873,15 +12390,43 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-argmaxpool_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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) {
--    source_set("f32-argmaxpool_x64_standalone") {
+-  if (build_with_chromium) {
+-    source_set("f32-argmaxpool_x64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -11899,6 +12444,46 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/include/xnnpack.h",
 -        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
 -      ]
++    configs -= [ "//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-argmaxpool_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
+-      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -11919,10 +12504,22 @@ Index: chromium-152.0.7977.64/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-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-qu8-vcvt/gen/f16-qu8-vcvt-avx512skx-u128.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma") {
@@ -11949,18 +12546,21 @@ Index: chromium-152.0.7977.64/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("f32-avgpool_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -11993,22 +12593,17 @@ Index: chromium-152.0.7977.64/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("f32-avgpool_avx512f") {
 -      cflags = [ "-mavx512f" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -12024,31 +12619,38 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-avx512skx-u128.c"
 +    ]
  
--      configs -= [ "//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-avgpool/gen/f32-avgpool-9p-minmax-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",
 -      ]
-+    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" ]
+     }
    }
 +}
  
@@ -12056,24 +12658,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-avgpool_avx512f_standalone") {
 -      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") {
-+    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"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c",
@@ -12098,10 +12683,16 @@ Index: chromium-152.0.7977.64/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-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("f32-avgpool_sse2-no-sse3") {
@@ -12126,18 +12717,21 @@ Index: chromium-152.0.7977.64/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("f32-avgpool_sse2-no-sse3_standalone") {
@@ -12168,22 +12762,17 @@ Index: chromium-152.0.7977.64/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("f32-avgpool_x64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_x64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-qu8-vcvt_x64_standalone") {
 +    cflags = [
 +  
 +    ]
@@ -12193,31 +12782,38 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "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" ]
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "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",
 -      ]
-+    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" ]
+     }
    }
 +}
  
@@ -12225,16 +12821,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-avgpool_x64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-qu8-vcvt_x64_standalone") {
++if (build_with_chromium) {
++  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"
 +    ]
  
 -      sources = [
@@ -12299,13 +12896,14 @@ Index: chromium-152.0.7977.64/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) {
@@ -12343,11 +12941,21 @@ Index: chromium-152.0.7977.64/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-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -12381,27 +12989,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-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" ]
  
+-      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(
@@ -12441,54 +13043,42 @@ Index: chromium-152.0.7977.64/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("f32-bf16-vcvt_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
+-      ]
++if (build_with_chromium) {
++  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 = [
--        "src/include/xnnpack.h",
--        "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" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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",
@@ -12496,12 +13086,16 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
  
@@ -12509,7 +13103,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-bf16-vcvt_x64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-rdminmax_x64_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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
@@ -12534,17 +13140,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f16-rdminmax_x64") {
-+    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" ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-conv-hwc2chw_sse-no-sse2") {
@@ -12569,21 +13168,18 @@ Index: chromium-152.0.7977.64/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("f32-conv-hwc2chw_sse-no-sse2_standalone") {
@@ -12614,66 +13210,32 @@ Index: chromium-152.0.7977.64/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("f32-conv-hwc2chw_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_x64_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"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "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" ]
- 
--      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-conv-hwc2chw_x64_standalone") {
--      cflags = []
 +if (build_with_chromium) {
 +  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
@@ -12693,6 +13255,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    "src/src/f16-rminmax/gen/f16-rminmax-avx512skx-u64-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("f32-conv-hwc2chw_x64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
@@ -12716,11 +13297,9 @@ Index: chromium-152.0.7977.64/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-dwconv2d-chw_sse-no-sse2") {
@@ -12748,18 +13327,33 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    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"
 +    ]
  
 -      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) {
@@ -12796,24 +13390,11 @@ Index: chromium-152.0.7977.64/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") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    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"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  if (build_with_chromium) {
@@ -12839,20 +13420,14 @@ Index: chromium-152.0.7977.64/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) {
@@ -12884,17 +13459,8 @@ Index: chromium-152.0.7977.64/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("f32-dwconv2d-chw_x64") {
--      cflags = []
+-    }
+-  }
 +if (build_with_chromium) {
 +  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
@@ -12917,6 +13483,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("f32-dwconv2d-chw_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-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
@@ -12940,20 +13514,15 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
@@ -14953,14 +15522,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-igemm_avx512f") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vcos_x64") {
++  source_set("f16-vcos_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-avx512f-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -15006,14 +15575,14 @@ Index: chromium-152.0.7977.64/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_x64_standalone") {
++  source_set("f16-vcos_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-avx512f-poly-3.c"
 +    ]
  
 -      sources = [
@@ -15161,16 +15730,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-velu_f16c-fma-avx2") {
++  source_set("f16-vcos_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
++      "src/src/f16-vcos/gen/f16-vcos-avx512fp16-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -15230,16 +15806,23 @@ Index: chromium-152.0.7977.64/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-vcos_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
++      "src/src/f16-vcos/gen/f16-vcos-avx512fp16-poly-3.c"
 +    ]
  
 -      sources = [
@@ -15341,14 +15924,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vexp_avx512f") {
++  source_set("f16-vcos_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-avx512f-poly-3.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-f16c-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -15406,14 +15991,16 @@ Index: chromium-152.0.7977.64/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_avx512f_standalone") {
++  source_set("f16-vcos_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-avx512f-poly-3.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-f16c-poly-3.c"
 +    ]
  
 -      sources = [
@@ -15481,23 +16068,14 @@ Index: chromium-152.0.7977.64/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-vcos_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-avx512fp16-poly-3.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15606,23 +16184,14 @@ Index: chromium-152.0.7977.64/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-vcos_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-avx512fp16-poly-3.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -15743,16 +16312,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vexp_f16c-no-avx2-no-fma") {
++  source_set("f16-velu_f16c-fma-avx2") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-f16c-poly-3.c"
++      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15835,16 +16404,16 @@ Index: chromium-152.0.7977.64/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-velu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-f16c-poly-3.c"
++      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
 +    ]
  
 -      sources = [
@@ -15914,14 +16483,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vexp_x64") {
++  source_set("f16-vexp_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-avx512f-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16030,14 +16599,14 @@ Index: chromium-152.0.7977.64/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-vexp_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-avx512f-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -16172,14 +16741,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_x64") {
++  source_set("f16-vexp_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-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-avx512fp16-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16285,14 +16863,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_x64_standalone") {
++  source_set("f16-vexp_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-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-avx512fp16-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -16359,7 +16946,7 @@ Index: chromium-152.0.7977.64/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-vhswish_f16c-no-avx2-no-fma") {
++  source_set("f16-vexp_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -16368,7 +16955,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-f16c-poly-3.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -16405,7 +16992,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-vexp_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -16414,7 +17001,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-f16c-poly-3.c"
 +    ]
  
 -      sources = [
@@ -16547,14 +17134,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vlog_avx512f") {
++  source_set("f16-vexp_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-avx512f-rational-1-3-div.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -16639,14 +17226,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vlog_avx512f_standalone") {
++  source_set("f16-vexp_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-avx512f-rational-1-3-div.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -16767,23 +17354,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-vgelu_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-1-3-div.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16864,23 +17442,14 @@ Index: chromium-152.0.7977.64/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-vgelu_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-1-3-div.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -16950,7 +17519,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vlog_f16c-no-avx2-no-fma") {
++  source_set("f16-vhswish_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -16959,7 +17528,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-f16c-rational-1-3-div.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17065,7 +17634,7 @@ Index: chromium-152.0.7977.64/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-vhswish_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -17074,7 +17643,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-f16c-rational-1-3-div.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -17202,14 +17771,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vlog_x64") {
++  source_set("f16-vlog_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-avx512f-rational-1-3-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17290,14 +17859,14 @@ Index: chromium-152.0.7977.64/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-vlog_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-avx512f-rational-1-3-div.c"
 +    ]
  
 -      sources = [
@@ -17341,16 +17910,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-qu8-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vlrelu_f16c-no-avx2-no-fma") {
++  source_set("f16-vlog_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-vlrelu/gen/f16-vlrelu-f16c-u16.c"
++      "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-1-3-div.c"
 +    ]
  
 -      sources = [
@@ -17398,16 +17974,23 @@ Index: chromium-152.0.7977.64/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-vlog_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-vlrelu/gen/f16-vlrelu-f16c-u16.c"
++      "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-1-3-div.c"
 +    ]
  
 -      sources = [
@@ -17450,16 +18033,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-raddstoreexpminusmax_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vmulcaddc_f16c-fma-no-avx2") {
++  source_set("f16-vlog_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-vlog/gen/f16-f32acc-vlog-f16c-rational-1-3-div.c"
 +    ]
  
 -      sources = [
@@ -17563,16 +18146,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  }
 +# 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-vlog_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-vlog/gen/f16-f32acc-vlog-f16c-rational-1-3-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17687,19 +18270,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vrnd_f16c-no-avx2-no-fma") {
++  source_set("f16-vlog_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    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-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -17757,19 +18335,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-vlog_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    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-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
 +    ]
  
 -      sources = [
@@ -17837,7 +18410,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vrsqrt_f16c-no-avx2-no-fma") {
++  source_set("f16-vlrelu_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -17846,7 +18419,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17933,7 +18506,7 @@ Index: chromium-152.0.7977.64/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-vrsqrt_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vlrelu_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -17942,7 +18515,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -18012,16 +18585,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsigmoid_f16c-fma-avx2") {
++  source_set("f16-vmulcaddc_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18104,16 +18677,16 @@ Index: chromium-152.0.7977.64/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_f16c-fma-avx2_standalone") {
++  source_set("f16-vmulcaddc_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
 +    ]
  
 -      sources = [
@@ -18183,14 +18756,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsin_x64") {
++  source_set("f16-vrnd_f16c-no-avx2-no-fma") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.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) {
@@ -18275,14 +18853,19 @@ Index: chromium-152.0.7977.64/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-vrnd_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.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 = [
@@ -18350,7 +18933,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_f16c-no-avx2-no-fma") {
++  source_set("f16-vrsqrt_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -18359,7 +18942,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18440,7 +19023,7 @@ Index: chromium-152.0.7977.64/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-vrsqrt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -18449,7 +19032,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -      sources = [
@@ -18517,14 +19100,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_x64") {
++  source_set("f16-vsigmoid_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18609,14 +19194,16 @@ Index: chromium-152.0.7977.64/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-vsigmoid_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
 +    ]
  
 -      sources = [
@@ -18684,14 +19271,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_avx512f") {
++  source_set("f16-vsin_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-avx512f-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18772,14 +19359,14 @@ Index: chromium-152.0.7977.64/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-vsin_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-avx512f-poly-3.c"
 +    ]
  
 -      sources = [
@@ -18847,7 +19434,7 @@ Index: chromium-152.0.7977.64/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-vsin_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -18863,7 +19450,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-vsin-avx512fp16-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18952,7 +19539,7 @@ Index: chromium-152.0.7977.64/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-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-vsin_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -18968,7 +19555,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-vsin-avx512fp16-poly-3.c"
 +    ]
  
 -      sources = [
@@ -19040,7 +19627,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_f16c-no-avx2-no-fma") {
++  source_set("f16-vsin_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -19049,7 +19636,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-f16c-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-f16c-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19134,7 +19721,7 @@ Index: chromium-152.0.7977.64/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-no-avx2-no-fma_standalone") {
++  source_set("f16-vsin_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -19143,7 +19730,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-f16c-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-f16c-poly-3.c"
 +    ]
  
 -      sources = [
@@ -19215,14 +19802,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_x64") {
++  source_set("f16-vsin_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19307,14 +19894,14 @@ Index: chromium-152.0.7977.64/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_x64_standalone") {
++  source_set("f16-vsin_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
 +    ]
  
 -      sources = [
@@ -19382,7 +19969,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vunary_f16c-no-avx2-no-fma") {
++  source_set("f16-vsqrt_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -19391,7 +19978,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19472,7 +20059,7 @@ Index: chromium-152.0.7977.64/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-vsqrt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -19481,7 +20068,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -      sources = [
@@ -19549,16 +20136,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vunary_sse2-no-sse3") {
++  source_set("f16-vsqrt_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    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/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19643,16 +20228,14 @@ Index: chromium-152.0.7977.64/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-vunary_sse2-no-sse3_standalone") {
++  source_set("f16-vsqrt_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    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/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -19720,15 +20303,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_sse2-no-sse3") {
++  source_set("f16-vtanh_avx512f") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19809,15 +20391,14 @@ Index: chromium-152.0.7977.64/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("f16-vtanh_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -19885,14 +20466,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_x64") {
++  source_set("f16-vtanh_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/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19973,14 +20563,23 @@ Index: chromium-152.0.7977.64/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_x64_standalone") {
++  source_set("f16-vtanh_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/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -20052,17 +20651,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f16-vtanh_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx",
++      "-mf16c",
 +    "-mno-avx2",
-+    "-mno-f16c",
 +    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-f16c-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -20147,17 +20745,16 @@ Index: chromium-152.0.7977.64/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("f16-vtanh_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx",
++      "-mf16c",
 +    "-mno-avx2",
-+    "-mno-f16c",
 +    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-f16c-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -20200,14 +20797,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vapproxgelu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_avx512f") {
++  source_set("f16-vtanh_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -20311,14 +20908,14 @@ Index: chromium-152.0.7977.64/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("f16-vtanh_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -20408,15 +21005,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_sse2-no-sse3") {
++  source_set("f16-vunary_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
++      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -20453,15 +21051,16 @@ Index: chromium-152.0.7977.64/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("f16-vunary_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
++      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -20643,14 +21242,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_x64") {
++  source_set("f16-vunary_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
++    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -20757,14 +21358,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_x64_standalone") {
++  source_set("f16-vunary_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
++    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -20898,20 +21501,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-argmaxpool_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512skx-u16.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -20975,20 +21573,15 @@ Index: chromium-152.0.7977.64/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-argmaxpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512skx-u16.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
 +    ]
  
 -      sources = [
@@ -21122,23 +21715,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16") {
++  source_set("f32-argmaxpool_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-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -21175,23 +21759,14 @@ Index: chromium-152.0.7977.64/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-argmaxpool_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-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -      sources = [
@@ -21315,14 +21890,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_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-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -21376,14 +21954,17 @@ Index: chromium-152.0.7977.64/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_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-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
 +    ]
  
 -      sources = [
@@ -21426,15 +22007,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vcmul_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_sse-no-sse2") {
++  source_set("f32-avgpool_avx512f") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
 +    ]
  
 -      sources = [
@@ -21538,15 +22118,14 @@ Index: chromium-152.0.7977.64/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_sse-no-sse2_standalone") {
++  source_set("f32-avgpool_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -21634,14 +22213,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_x64") {
++  source_set("f32-avgpool_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -21678,14 +22258,15 @@ Index: chromium-152.0.7977.64/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_x64_standalone") {
++  source_set("f32-avgpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
 +    ]
  
 -      sources = [
@@ -21807,18 +22388,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_sse-no-sse2") {
++  source_set("f32-avgpool_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    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-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -21855,18 +22432,14 @@ Index: chromium-152.0.7977.64/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_sse-no-sse2_standalone") {
++  source_set("f32-avgpool_x64_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    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-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -21986,15 +22559,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512skx-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -22031,15 +22609,20 @@ Index: chromium-152.0.7977.64/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_ssse3-no-sse4.1_standalone") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512skx-u16.c"
 +    ]
  
 -      sources = [
@@ -22157,21 +22740,23 @@ Index: chromium-152.0.7977.64/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-dwconv2d-chw_x64") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16") {
 +    cflags = [
-+  
++      "-mavx512bf16",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-bf16-vcvt/gen/f32-bf16-vcvt-avx512bf16-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -22208,21 +22793,23 @@ Index: chromium-152.0.7977.64/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_x64_standalone") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16_standalone") {
 +    cflags = [
-+  
++      "-mavx512bf16",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-bf16-vcvt/gen/f32-bf16-vcvt-avx512bf16-u16.c"
 +    ]
  
 -      sources = [
@@ -22352,20 +22939,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-bf16-vcvt_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    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-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -22424,20 +23005,14 @@ Index: chromium-152.0.7977.64/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_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-bf16-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    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-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -22505,17 +23080,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_avx512f") {
++  source_set("f32-conv-hwc2chw_sse-no-sse2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -22600,17 +23173,15 @@ Index: chromium-152.0.7977.64/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_avx512f_standalone") {
++  source_set("f32-conv-hwc2chw_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
 +    ]
  
 -      sources = [
@@ -22653,19 +23224,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-velu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_f16c-fma-no-avx2") {
++  source_set("f32-conv-hwc2chw_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    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-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -      sources = [
@@ -22769,19 +23335,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  }
 +# 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-conv-hwc2chw_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    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-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -22869,7 +23430,7 @@ Index: chromium-152.0.7977.64/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-dwconv_sse-no-sse2") {
++  source_set("f32-dwconv2d-chw_sse-no-sse2") {
 +    cflags = [
 +      "-mno-sse2",
 +    "-msse"
@@ -22877,10 +23438,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -22917,7 +23478,7 @@ Index: chromium-152.0.7977.64/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_sse-no-sse2_standalone") {
++  source_set("f32-dwconv2d-chw_sse-no-sse2_standalone") {
 +    cflags = [
 +      "-mno-sse2",
 +    "-msse"
@@ -22925,10 +23486,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-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 = [
@@ -23044,23 +23605,15 @@ Index: chromium-152.0.7977.64/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-dwconv_x64") {
++  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -23097,23 +23650,15 @@ Index: chromium-152.0.7977.64/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_x64_standalone") {
++  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
 +    ]
  
 -      sources = [
@@ -23243,17 +23788,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-dwconv2d-chw_x64") {
 +    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"
++      "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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -23312,17 +23861,21 @@ Index: chromium-152.0.7977.64/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_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-dwconv2d-chw_x64_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"
++      "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 = [
@@ -23390,20 +23943,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -23488,20 +24041,20 @@ Index: chromium-152.0.7977.64/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-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.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 = [
@@ -23544,16 +24097,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vgelu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_f16c-no-avx2-no-fma") {
++  source_set("f32-dwconv_avx512f") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-u16.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 = [
@@ -23657,16 +24211,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  }
 +# 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") {
++  source_set("f32-dwconv_avx512f_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-u16.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) {
@@ -23756,15 +24311,19 @@ Index: chromium-152.0.7977.64/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-f16-vcvt_sse2-no-sse3") {
++  source_set("f32-dwconv_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -23801,15 +24360,19 @@ Index: chromium-152.0.7977.64/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_sse2-no-sse3_standalone") {
++  source_set("f32-dwconv_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.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 = [
@@ -23925,15 +24488,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_sse4.1-no-sse4.2") {
++  source_set("f32-dwconv_sse-no-sse2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.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" ]
@@ -23970,15 +24536,18 @@ Index: chromium-152.0.7977.64/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-f16-vcvt_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-dwconv_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.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 = [
@@ -24108,14 +24677,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_x64") {
++  source_set("f32-dwconv_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -24174,14 +24752,23 @@ Index: chromium-152.0.7977.64/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_x64_standalone") {
++  source_set("f32-dwconv_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.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 = [
@@ -24224,7 +24811,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vhswish_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -24234,10 +24821,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-avx-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-avx-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-avx-broadcast.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c"
 +    ]
  
 -      sources = [
@@ -24284,7 +24868,7 @@ Index: chromium-152.0.7977.64/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-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -24294,10 +24878,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-avx-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-avx-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-avx-broadcast.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c"
 +    ]
  
 -      sources = [
@@ -24340,17 +24921,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vlog_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-gemm_avx512f") {
++  source_set("f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x32-minmax-avx512f-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x32-minmax-avx512f-broadcast.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.c"
 +    ]
  
 -      sources = [
@@ -24454,17 +25038,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_avx512f_standalone") {
++  source_set("f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x32-minmax-avx512f-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x32-minmax-avx512f-broadcast.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -24570,24 +25157,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-gemm_f16c-fma-no-avx2") {
++  source_set("f32-f16-vcvt_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-10x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-2x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-fma3-broadcast.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -24646,24 +25225,16 @@ Index: chromium-152.0.7977.64/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_f16c-fma-no-avx2_standalone") {
++  source_set("f32-f16-vcvt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-10x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-2x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-fma3-broadcast.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -24731,17 +25302,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-gemm_sse-no-sse2") {
++  source_set("f32-f16-vcvt_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-sse-load1.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2c4-minmax-sse.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-sse-load1.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -24826,17 +25395,15 @@ Index: chromium-152.0.7977.64/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-gemm_sse-no-sse2_standalone") {
++  source_set("f32-f16-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-sse-load1.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2c4-minmax-sse.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-sse-load1.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.c"
 +    ]
  
 -      sources = [
@@ -24879,19 +25446,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vlrelu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-gemm_x64") {
++  source_set("f32-f16-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.c"
 +    ]
  
 -      sources = [
@@ -24993,19 +25556,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_x64_standalone") {
++  source_set("f32-f16-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -25093,15 +25652,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_sse-no-sse2") {
++  source_set("f32-f16-vcvt_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-sse-p8.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -25138,15 +25696,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear-chw_sse-no-sse2_standalone") {
++  source_set("f32-f16-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-sse-p8.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      sources = [
@@ -25258,653 +25815,1725 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_x64") {
++  source_set("f32-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-avx-broadcast.c",
++    "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-ibilinear-chw_x64_standalone") {
++  source_set("f32-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-avx-broadcast.c",
++    "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-ibilinear_sse-no-sse2") {
++  source_set("f32-gemm_avx512f") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-sse-u8.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx512f-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x32-minmax-avx512f-broadcast.c",
++    "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-ibilinear_sse-no-sse2_standalone") {
++  source_set("f32-gemm_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-sse-u8.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-avx512f-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x32-minmax-avx512f-broadcast.c",
++    "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-ibilinear_x64") {
++  source_set("f32-gemm_f16c-fma-no-avx2") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-gemm/gen/f32-gemm-10x8-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-2x16-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-fma3-broadcast.c",
++    "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-ibilinear_x64_standalone") {
++  source_set("f32-gemm_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-gemm/gen/f32-gemm-10x8-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-2x16-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-fma3-broadcast.c",
++    "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-igemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-gemm_sse-no-sse2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-avx-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-avx-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-avx-broadcast.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-sse-load1.c",
++    "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-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-gemm_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-avx-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-avx-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-avx-broadcast.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-sse-load1.c",
++    "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-igemm_avx512f") {
++  source_set("f32-gemm_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x32-minmax-avx512f-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-7x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-7x32-minmax-avx512f-broadcast.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"
 +    ]
-+
+ 
+-      configs -= [ "//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-igemm_avx512f_standalone") {
++  source_set("f32-gemm_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x32-minmax-avx512f-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-7x16-minmax-avx512f-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-7x32-minmax-avx512f-broadcast.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 = [
+-        "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-igemm_f16c-fma-no-avx2") {
++  source_set("f32-ibilinear-chw_sse-no-sse2") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-10x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-fma3-broadcast.c",
-+    "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"
++      "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-igemm_f16c-fma-no-avx2_standalone") {
++  source_set("f32-ibilinear-chw_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-10x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x16s4-minmax-fma3-broadcast.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-fma3-broadcast.c",
-+    "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" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/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-igemm_sse-no-sse2") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-sse-load1.c",
-+    "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" ]
-+
-+    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-igemm_sse-no-sse2_standalone") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-sse-load1.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2c4-minmax-sse.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-sse-load1.c"
++      "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-igemm_x64") {
++  source_set("f32-ibilinear-chw_x64") {
 +    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"
++      "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-igemm_x64_standalone") {
++  source_set("f32-ibilinear-chw_x64_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"
++      "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-maxpool_sse2-no-sse3") {
++  source_set("f32-ibilinear_sse-no-sse2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-sse2-u4.c"
++      "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-maxpool_sse2-no-sse3_standalone") {
++  source_set("f32-ibilinear_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-sse2-u4.c"
++      "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-maxpool_x64") {
++  source_set("f32-ibilinear_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "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-maxpool_x64_standalone") {
++  source_set("f32-ibilinear_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "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-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-igemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -25914,29 +27543,47 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-avx-broadcast.c",
++    "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-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -25946,97 +27593,299 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-avx-broadcast.c",
++    "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-qc4w-gemm_f16c-fma-avx2") {
++  source_set("f32-igemm_avx512f") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx512f-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x32-minmax-avx512f-broadcast.c",
++    "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-qc4w-gemm_f16c-fma-avx2_standalone") {
++  source_set("f32-igemm_avx512f_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-avx512f-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x32-minmax-avx512f-broadcast.c",
++    "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-qc4w-gemm_f16c-fma-no-avx2") {
++  source_set("f32-igemm_f16c-fma-no-avx2") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -26045,29 +27894,51 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "src/src/f32-igemm/gen/f32-igemm-10x8-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-fma3-broadcast.c",
++    "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-qc4w-gemm_f16c-fma-no-avx2_standalone") {
++  source_set("f32-igemm_f16c-fma-no-avx2_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -26076,110 +27947,371 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "src/src/f32-igemm/gen/f32-igemm-10x8-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x16s4-minmax-fma3-broadcast.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-fma3-broadcast.c",
++    "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" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/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-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-qc4w-gemm_sse4.1-no-sse4.2") {
++  source_set("f32-igemm_sse-no-sse2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-sse-load1.c",
++    "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-qc4w-gemm_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-igemm_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-sse-load1.c",
++    "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-qc4w-gemm_x64") {
++  source_set("f32-igemm_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x4-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"
 +    ]
-+
+ 
+-      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",
@@ -26188,334 +28320,920 @@ Index: chromium-152.0.7977.64/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-qc4w-gemm_x64_standalone") {
++  source_set("f32-igemm_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x4-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/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-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-maxpool_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "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-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-maxpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "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-qc8w-gemm_f16c-fma-avx2") {
++  source_set("f32-maxpool_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "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-qc8w-gemm_f16c-fma-avx2_standalone") {
++  source_set("f32-maxpool_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "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-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-1x32-minmax-avx512skx-broadcast.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-7x32-minmax-avx512skx-broadcast.c",
-+    "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"
++      "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-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-1x32-minmax-avx512skx-broadcast.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-7x32-minmax-avx512skx-broadcast.c",
-+    "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"
++      "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-qc8w-gemm_f16c-fma-no-avx2") {
++  source_set("f32-qc4w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "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-qc8w-gemm_f16c-fma-no-avx2_standalone") {
++  source_set("f32-qc4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "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" ]
-+
-+    if (!(is_android && use_order_profiling)) {
+ 
+-      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-qc8w-gemm_sse4.1-no-sse4.2") {
++  source_set("f32-qc4w-gemm_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "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",
@@ -26524,28 +29242,89 @@ Index: chromium-152.0.7977.64/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-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-qc4w-gemm_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "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",
@@ -26557,90 +29336,263 @@ Index: chromium-152.0.7977.64/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-qc8w-gemm_x64") {
++  source_set("f32-qc4w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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-qc8w-gemm_x64_standalone") {
++  source_set("f32-qc4w-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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-qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-qc4w-gemm_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.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"
 +    ]
-+
+ 
+-      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",
@@ -26649,206 +29601,2564 @@ Index: chromium-152.0.7977.64/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-qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-qc4w-gemm_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.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"
 +    ]
-+
+ 
+-      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-qs8-vcvt_f16c-fma-avx2") {
++  source_set("f32-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx2-u64.c"
++      "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-qs8-vcvt_f16c-fma-avx2_standalone") {
++  source_set("f32-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx2-u64.c"
++      "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-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-qc8w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c"
++      "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-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-qc8w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c"
++      "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" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/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 = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
+ 
+-  # 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 = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-1x32-minmax-avx512skx-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-7x32-minmax-avx512skx-broadcast.c",
++    "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") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-1x32-minmax-avx512skx-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-7x32-minmax-avx512skx-broadcast.c",
++    "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 = [
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "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") {
++    cflags = [
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "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 = [
++      "-mno-sse4.2",
++    "-msse4.1"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "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") {
++    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "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 = [
++  
++    ]
++  
++    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"
++    ]
+ 
+-  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") {
++    cflags = [
++  
++    ]
++  
++    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"
++    ]
+ 
+-      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 = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "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") {
++    cflags = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "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 = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "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") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "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 = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "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",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    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") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "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 = [
++      "-mno-sse3",
++    "-msse2"
++    ]
++  
++    sources = [
 +      "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") {
@@ -26861,27 +32171,131 @@ Index: chromium-152.0.7977.64/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 = [
@@ -26893,23 +32307,85 @@ Index: chromium-152.0.7977.64/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") {
@@ -26922,27 +32398,73 @@ Index: chromium-152.0.7977.64/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 = [
@@ -26954,23 +32476,113 @@ Index: chromium-152.0.7977.64/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") {
@@ -26983,27 +32595,138 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27017,23 +32740,130 @@ Index: chromium-152.0.7977.64/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") {
@@ -27048,27 +32878,131 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27081,23 +33015,85 @@ Index: chromium-152.0.7977.64/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") {
@@ -27111,27 +33107,75 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27148,23 +33192,113 @@ Index: chromium-152.0.7977.64/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") {
@@ -27182,27 +33316,138 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27214,23 +33459,130 @@ Index: chromium-152.0.7977.64/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") {
@@ -27243,27 +33595,131 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27275,23 +33731,85 @@ Index: chromium-152.0.7977.64/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") {
@@ -27304,27 +33822,75 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27335,23 +33901,111 @@ Index: chromium-152.0.7977.64/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") {
@@ -27363,27 +34017,134 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27396,23 +34157,110 @@ Index: chromium-152.0.7977.64/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") {
@@ -27426,27 +34274,87 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27463,23 +34371,109 @@ Index: chromium-152.0.7977.64/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") {
@@ -27497,27 +34491,111 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27529,12 +34607,47 @@ Index: chromium-152.0.7977.64/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",
@@ -27543,9 +34656,38 @@ Index: chromium-152.0.7977.64/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") {
@@ -27558,27 +34700,124 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27589,23 +34828,83 @@ Index: chromium-152.0.7977.64/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") {
@@ -27617,27 +34916,71 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27652,23 +34995,113 @@ Index: chromium-152.0.7977.64/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") {
@@ -27684,27 +35117,138 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27716,23 +35260,54 @@ Index: chromium-152.0.7977.64/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") {
@@ -27745,27 +35320,150 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27778,23 +35476,128 @@ Index: chromium-152.0.7977.64/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") {
@@ -27808,27 +35611,108 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27840,23 +35724,82 @@ Index: chromium-152.0.7977.64/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") {
@@ -27869,27 +35812,129 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27903,23 +35948,116 @@ Index: chromium-152.0.7977.64/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") {
@@ -27934,27 +36072,143 @@ Index: chromium-152.0.7977.64/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 = [
@@ -27965,23 +36219,85 @@ Index: chromium-152.0.7977.64/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") {
@@ -27993,27 +36309,47 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28025,23 +36361,113 @@ Index: chromium-152.0.7977.64/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") {
@@ -28054,27 +36480,129 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28085,12 +36613,49 @@ Index: chromium-152.0.7977.64/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",
@@ -28099,9 +36664,12 @@ Index: chromium-152.0.7977.64/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") {
@@ -28113,27 +36681,73 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28147,23 +36761,114 @@ Index: chromium-152.0.7977.64/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") {
@@ -28178,27 +36883,137 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28209,23 +37024,113 @@ Index: chromium-152.0.7977.64/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") {
@@ -28237,27 +37142,90 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28269,23 +37237,115 @@ Index: chromium-152.0.7977.64/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") {
@@ -28298,27 +37358,118 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28329,12 +37480,50 @@ Index: chromium-152.0.7977.64/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",
@@ -28343,9 +37532,34 @@ Index: chromium-152.0.7977.64/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") {
@@ -28357,27 +37571,138 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28393,23 +37718,130 @@ Index: chromium-152.0.7977.64/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") {
@@ -28426,27 +37858,131 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28459,23 +37995,85 @@ Index: chromium-152.0.7977.64/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") {
@@ -28489,27 +38087,47 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28523,23 +38141,111 @@ Index: chromium-152.0.7977.64/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") {
@@ -28554,27 +38260,118 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28587,12 +38384,50 @@ Index: chromium-152.0.7977.64/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",
@@ -28601,9 +38436,34 @@ Index: chromium-152.0.7977.64/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") {
@@ -28617,27 +38477,138 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28651,23 +38622,130 @@ Index: chromium-152.0.7977.64/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") {
@@ -28682,27 +38760,131 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28713,23 +38895,85 @@ Index: chromium-152.0.7977.64/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") {
@@ -28741,27 +38985,47 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28773,23 +39037,111 @@ Index: chromium-152.0.7977.64/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") {
@@ -28802,27 +39154,106 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28833,23 +39264,39 @@ Index: chromium-152.0.7977.64/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") {
@@ -28861,27 +39308,139 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28895,12 +39454,52 @@ Index: chromium-152.0.7977.64/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",
@@ -28909,9 +39508,32 @@ Index: chromium-152.0.7977.64/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") {
@@ -28926,12 +39548,45 @@ Index: chromium-152.0.7977.64/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",
@@ -28943,10 +39598,18 @@ Index: chromium-152.0.7977.64/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 = [
@@ -28957,23 +39620,39 @@ Index: chromium-152.0.7977.64/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") {
@@ -28985,27 +39664,137 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29017,12 +39806,47 @@ Index: chromium-152.0.7977.64/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",
@@ -29031,9 +39855,39 @@ Index: chromium-152.0.7977.64/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") {
@@ -29046,27 +39900,139 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29077,23 +40043,83 @@ Index: chromium-152.0.7977.64/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") {
@@ -29105,27 +40131,71 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29137,23 +40207,108 @@ Index: chromium-152.0.7977.64/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") {
@@ -29166,27 +40321,131 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29199,23 +40458,103 @@ Index: chromium-152.0.7977.64/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") {
@@ -29229,12 +40568,45 @@ Index: chromium-152.0.7977.64/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",
@@ -29246,10 +40618,19 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29263,23 +40644,39 @@ Index: chromium-152.0.7977.64/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") {
@@ -29294,27 +40691,136 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29325,12 +40831,47 @@ Index: chromium-152.0.7977.64/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",
@@ -29339,9 +40880,38 @@ Index: chromium-152.0.7977.64/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") {
@@ -29353,27 +40923,124 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29386,23 +41053,83 @@ Index: chromium-152.0.7977.64/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") {
@@ -29416,27 +41143,73 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29449,23 +41222,108 @@ Index: chromium-152.0.7977.64/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") {
@@ -29479,27 +41337,119 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29510,23 +41460,103 @@ Index: chromium-152.0.7977.64/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") {
@@ -29538,12 +41568,45 @@ Index: chromium-152.0.7977.64/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",
@@ -29555,10 +41618,18 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29590,23 +41661,39 @@ Index: chromium-152.0.7977.64/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") {
@@ -29639,27 +41726,135 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29688,12 +41883,47 @@ Index: chromium-152.0.7977.64/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",
@@ -29702,9 +41932,32 @@ Index: chromium-152.0.7977.64/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") {
@@ -29734,27 +41987,118 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29781,23 +42125,83 @@ Index: chromium-152.0.7977.64/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") {
@@ -29825,27 +42229,46 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29859,23 +42282,108 @@ Index: chromium-152.0.7977.64/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") {
@@ -29890,27 +42398,106 @@ Index: chromium-152.0.7977.64/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 = [
@@ -29939,12 +42526,46 @@ Index: chromium-152.0.7977.64/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",
@@ -29953,9 +42574,12 @@ Index: chromium-152.0.7977.64/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") {
@@ -29985,27 +42609,46 @@ Index: chromium-152.0.7977.64/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 = [
@@ -30019,514 +42662,111 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vclamp/gen/f32-vclamp-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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# 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") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-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" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("f32-vclamp_avx512f") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_avx512f_standalone") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-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-vclamp_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-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" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("f32-vclamp_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "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" ]
-+
-+    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-vclamp_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "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" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/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 = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-avx512f-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("f32-vcmul_avx512f_standalone") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-avx512f-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-vcmul_f16c-fma-no-avx2") {
-+    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-fma3-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" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_f16c-fma-no-avx2_standalone") {
-+    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-fma3-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-vcmul_sse-no-sse2") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_sse-no-sse2_standalone") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-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-vcmul_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "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" ]
-+
-+    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-vcmul_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "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" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/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_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c"
-+    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/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-vcopysign_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vclamp_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -30536,49 +42776,158 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c"
++      "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-vcopysign_avx512f") {
++  source_set("f32-vclamp_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-avx512f.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx512f.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c"
++      "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",
@@ -30587,45 +42936,90 @@ Index: chromium-152.0.7977.64/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-vcopysign_avx512f_standalone") {
++  source_set("f32-vclamp_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-avx512f.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx512f.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c"
++      "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-vcopysign_sse2-no-sse3") {
++  source_set("f32-vclamp_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -30633,30 +43027,90 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c"
++      "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-vcopysign_sse2-no-sse3_standalone") {
++  source_set("f32-vclamp_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -30664,220 +43118,380 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c"
++      "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-vcopysign_x64") {
++  source_set("f32-vclamp_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
-+
+ 
+-  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-vcopysign_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/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_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vclamp_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
 +  
-+    sources = [
-+      "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" ]
-+
-+    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-vcos_avx-no-avx2-no-f16c-no-fma_standalone") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-avx-rational-5-4-div.c"
++      "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-vcos_avx512f") {
++  source_set("f32-vcmul_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c"
++      "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-vcos_avx512f_standalone") {
++  source_set("f32-vcmul_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c"
++      "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-vcos_f16c-fma-no-avx2") {
++  source_set("f32-vcmul_f16c-fma-no-avx2") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -30886,28 +43500,115 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c"
++      "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-vcos_f16c-fma-no-avx2_standalone") {
++  source_set("f32-vcmul_f16c-fma-no-avx2_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -30916,47 +43617,177 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c"
++      "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-vcos_sse2-no-sse3") {
++  source_set("f32-vcmul_sse-no-sse2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "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",
@@ -30965,104 +43796,360 @@ Index: chromium-152.0.7977.64/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-vcos_sse2-no-sse3_standalone") {
++  source_set("f32-vcmul_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "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-vcos_x64") {
++  source_set("f32-vcmul_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-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-vcos_x64_standalone") {
++  source_set("f32-vcmul_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-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-velu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -31072,14 +44159,51 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-u32.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c"
 +    ]
-+
+ 
+-      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",
@@ -31088,12 +44212,41 @@ Index: chromium-152.0.7977.64/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-velu_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -31103,153 +44256,297 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-u32.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c"
 +    ]
-+
+ 
+-      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-velu_avx512f") {
++  source_set("f32-vcopysign_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-avx512f.c",
++    "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-velu_avx512f_standalone") {
++  source_set("f32-vcopysign_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    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 = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx2-rr1-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" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_f16c-fma-avx2_standalone") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-avx512f.c",
++    "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-velu_sse2-no-sse3") {
++  source_set("f32-vcopysign_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -31257,28 +44554,118 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c",
++    "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-velu_sse2-no-sse3_standalone") {
++  source_set("f32-vcopysign_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -31286,73 +44673,303 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c",
++    "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-velu_x64") {
++  source_set("f32-vcopysign_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.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("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-velu_x64_standalone") {
++  source_set("f32-vcopysign_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.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"
 +    ]
-+
+ 
+-      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",
@@ -31364,12 +44981,21 @@ Index: chromium-152.0.7977.64/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-vexp_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -31379,28 +45005,44 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-avx-rational-3-2-div.c"
++      "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-vexp_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -31410,45 +45052,193 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-avx-rational-3-2-div.c"
++      "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-vexp_avx512f") {
++  source_set("f32-vcos_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c"
++      "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",
@@ -31457,43 +45247,173 @@ Index: chromium-152.0.7977.64/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-vexp_avx512f_standalone") {
++  source_set("f32-vcos_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c"
++      "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-vexp_f16c-fma-no-avx2") {
++  source_set("f32-vcos_f16c-fma-no-avx2") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -31502,28 +45422,90 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
++      "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-vexp_f16c-fma-no-avx2_standalone") {
++  source_set("f32-vcos_f16c-fma-no-avx2_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -31532,31 +45514,77 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
++      "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-vexp_sse2-no-sse3") {
++  source_set("f32-vcos_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -31564,29 +45592,89 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-sse2-rational-3-2-div.c",
-+    "src/src/f32-vexp/gen/f32-vexp-sse2fma-rational-3-2-div.c"
++      "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-vexp_sse2-no-sse3_standalone") {
++  source_set("f32-vcos_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -31594,91 +45682,257 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-sse2-rational-3-2-div.c",
-+    "src/src/f32-vexp/gen/f32-vexp-sse2fma-rational-3-2-div.c"
++      "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-vexp_x64") {
++  source_set("f32-vcos_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "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-vexp_x64_standalone") {
++  source_set("f32-vcos_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "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-vgelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-velu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -31688,200 +45942,837 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c"
++      "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") {
++    cflags = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "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 = [
++      "-mavx512f"
++    ]
++  
++    sources = [
++      "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",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
 +
++    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-vgelu_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-velu_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c"
++      "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-vgelu_avx512f") {
++  source_set("f32-velu_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
++      "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-vgelu_avx512f_standalone") {
++  source_set("f32-velu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
++      "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-vgelu_f16c-fma-no-avx2") {
++  source_set("f32-velu_sse2-no-sse3") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
++      "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-vgelu_f16c-fma-no-avx2_standalone") {
++  source_set("f32-velu_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
++      "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-vgelu_sse2-no-sse3") {
++  source_set("f32-velu_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-sse2-rational-12-10-div.c",
-+    "src/src/f32-vgelu/gen/f32-vgelu-sse2fma-rational-12-10-div.c"
++      "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",
@@ -31890,87 +46781,230 @@ Index: chromium-152.0.7977.64/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-vgelu_sse2-no-sse3_standalone") {
++  source_set("f32-velu_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-sse2-rational-12-10-div.c",
-+    "src/src/f32-vgelu/gen/f32-vgelu-sse2fma-rational-12-10-div.c"
++      "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-vgelu_x64") {
++  source_set("f32-vexp_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "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-vgelu_x64_standalone") {
++  source_set("f32-vexp_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "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",
@@ -31979,32 +47013,113 @@ Index: chromium-152.0.7977.64/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-vhswish_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vexp_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
++      "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",
@@ -32013,53 +47128,166 @@ Index: chromium-152.0.7977.64/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-vhswish_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vexp_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
++      "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-vhswish_avx512f") {
++  source_set("f32-vexp_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
++      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32080,14 +47308,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_avx512f_standalone") {
++  source_set("f32-vexp_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
++      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32111,16 +47341,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_f16c-fma-no-avx2") {
++  source_set("f32-vexp_sse2-no-sse3") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-fma3.c"
++      "src/src/f32-vexp/gen/f32-vexp-sse2-rational-3-2-div.c",
++    "src/src/f32-vexp/gen/f32-vexp-sse2fma-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32141,16 +47371,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_f16c-fma-no-avx2_standalone") {
++  source_set("f32-vexp_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-fma3.c"
++      "src/src/f32-vexp/gen/f32-vexp-sse2-rational-3-2-div.c",
++    "src/src/f32-vexp/gen/f32-vexp-sse2fma-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32174,16 +47404,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_sse2-no-sse3") {
++  source_set("f32-vexp_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-sse2.c",
-+    "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32204,16 +47432,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_sse2-no-sse3_standalone") {
++  source_set("f32-vexp_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-sse2.c",
-+    "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32237,14 +47463,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_x64") {
++  source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32265,14 +47494,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_x64_standalone") {
++  source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32296,14 +47528,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlog_avx512f") {
++  source_set("f32-vgelu_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32324,77 +47556,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_avx512f_standalone") {
++  source_set("f32-vgelu_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    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 (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",
-+    ]
-+
-+    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"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32418,7 +47587,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlog_f16c-fma-no-avx2") {
++  source_set("f32-vgelu_f16c-fma-no-avx2") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -32427,7 +47596,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32448,7 +47617,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_f16c-fma-no-avx2_standalone") {
++  source_set("f32-vgelu_f16c-fma-no-avx2_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -32457,7 +47626,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32481,7 +47650,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlog_sse2-no-sse3") {
++  source_set("f32-vgelu_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -32489,8 +47658,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/f32-vgelu/gen/f32-vgelu-sse2-rational-12-10-div.c",
++    "src/src/f32-vgelu/gen/f32-vgelu-sse2fma-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32511,7 +47680,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_sse2-no-sse3_standalone") {
++  source_set("f32-vgelu_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -32519,8 +47688,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/f32-vgelu/gen/f32-vgelu-sse2-rational-12-10-div.c",
++    "src/src/f32-vgelu/gen/f32-vgelu-sse2fma-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32544,14 +47713,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlog_x64") {
++  source_set("f32-vgelu_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32572,14 +47741,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_x64_standalone") {
++  source_set("f32-vgelu_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32603,7 +47772,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -32613,7 +47782,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-avx-u16.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32634,7 +47803,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -32644,7 +47813,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-avx-u16.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32668,14 +47837,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_avx512f") {
++  source_set("f32-vhswish_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-avx512f-u16.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32696,14 +47865,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_avx512f_standalone") {
++  source_set("f32-vhswish_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-avx512f-u16.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32727,15 +47896,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_sse-no-sse2") {
++  source_set("f32-vhswish_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-sse-u8.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-fma3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32756,15 +47926,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_sse-no-sse2_standalone") {
++  source_set("f32-vhswish_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-sse-u8.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-fma3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32788,15 +47959,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_sse4.1-no-sse4.2") {
++  source_set("f32-vhswish_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-u8.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-sse2.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32817,15 +47989,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vhswish_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-u8.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-sse2.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32849,14 +48022,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_x64") {
++  source_set("f32-vhswish_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32877,14 +48050,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_x64_standalone") {
++  source_set("f32-vhswish_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32908,15 +48081,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_sse-no-sse2") {
++  source_set("f32-vlog_avx512f") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c"
++      "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32937,15 +48109,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vmulcaddc_sse-no-sse2_standalone") {
++  source_set("f32-vlog_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c"
++      "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32969,14 +48140,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_x64") {
++  source_set("f32-vlog_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
++      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32997,14 +48170,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vmulcaddc_x64_standalone") {
++  source_set("f32-vlog_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
++      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33028,20 +48203,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vlog_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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"
++      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33062,20 +48233,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vlog_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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"
++      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33099,17 +48266,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_avx512f") {
++  source_set("f32-vlog_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -33130,17 +48296,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_avx512f_standalone") {
++  source_set("f32-vlog_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -33164,18 +48329,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_sse2-no-sse3") {
++  source_set("f32-vlog_x64") {
 +    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"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33196,18 +48357,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_sse2-no-sse3_standalone") {
++  source_set("f32-vlog_x64_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"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33231,18 +48388,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_sse4.1-no-sse4.2") {
++  source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-avx-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33263,18 +48419,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-avx-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33298,17 +48453,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_x64") {
++  source_set("f32-vlrelu_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-vlrelu/gen/f32-vlrelu-avx512f-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33329,17 +48481,75 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_x64_standalone") {
++  source_set("f32-vlrelu_avx512f_standalone") {
++    cflags = [
++      "-mavx512f"
++    ]
++  
++    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" ]
++    }
++  }
++}
++
++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",
++    ]
++
++    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-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-vlrelu/gen/f32-vlrelu-sse-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33363,18 +48573,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vlrelu_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33395,18 +48602,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vlrelu_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33430,15 +48634,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_avx512f") {
++  source_set("f32-vlrelu_x64") {
 +    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"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33459,15 +48662,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_avx512f_standalone") {
++  source_set("f32-vlrelu_x64_standalone") {
 +    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"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33491,16 +48693,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_sse2-no-sse3") {
++  source_set("f32-vmulcaddc_sse-no-sse2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33521,16 +48722,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_sse2-no-sse3_standalone") {
++  source_set("f32-vmulcaddc_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33554,15 +48754,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_x64") {
++  source_set("f32-vmulcaddc_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"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33583,15 +48782,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_x64_standalone") {
++  source_set("f32-vmulcaddc_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33615,7 +48813,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vrnd_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -33625,7 +48823,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c"
++      "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" ]
@@ -33646,7 +48847,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vrnd_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -33656,7 +48857,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c"
++      "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" ]
@@ -33680,14 +48884,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_avx512f") {
++  source_set("f32-vrnd_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c"
++      "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" ]
@@ -33708,14 +48915,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_avx512f_standalone") {
++  source_set("f32-vrnd_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c"
++      "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" ]
@@ -33739,16 +48949,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_f16c-fma-avx2") {
++  source_set("f32-vrnd_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
++      "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" ]
@@ -33769,16 +48981,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_f16c-fma-avx2_standalone") {
++  source_set("f32-vrnd_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
++      "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" ]
@@ -33802,15 +49016,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_sse2-no-sse3") {
++  source_set("f32-vrnd_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c"
++      "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" ]
@@ -33831,15 +49048,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_sse2-no-sse3_standalone") {
++  source_set("f32-vrnd_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c"
++      "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" ]
@@ -33863,16 +49083,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_sse4.1-no-sse4.2") {
++  source_set("f32-vrnd_x64") {
 +    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"
++      "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" ]
@@ -33893,16 +49114,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vrnd_x64_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"
++      "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" ]
@@ -33926,14 +49148,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_x64") {
++  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-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "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" ]
@@ -33954,14 +49180,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_x64_standalone") {
++  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-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "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" ]
@@ -33985,17 +49215,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vrsqrt_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.c"
++      "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" ]
@@ -34016,17 +49244,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vrsqrt_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.c"
++      "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" ]
@@ -34050,14 +49276,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_avx512f") {
++  source_set("f32-vrsqrt_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.c"
++      "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" ]
@@ -34078,14 +49306,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_avx512f_standalone") {
++  source_set("f32-vrsqrt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.c"
++      "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" ]
@@ -34109,16 +49339,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_f16c-fma-no-avx2") {
++  source_set("f32-vrsqrt_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34139,16 +49368,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_f16c-fma-no-avx2_standalone") {
++  source_set("f32-vrsqrt_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34172,16 +49400,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_sse2-no-sse3") {
++  source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34202,16 +49431,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_sse2-no-sse3_standalone") {
++  source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34235,14 +49465,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_x64") {
++  source_set("f32-vsigmoid_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34263,14 +49493,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_x64_standalone") {
++  source_set("f32-vsigmoid_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34294,18 +49524,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vsigmoid_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34326,18 +49554,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vsigmoid_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34361,14 +49587,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_avx512f") {
++  source_set("f32-vsigmoid_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c"
++      "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" ]
@@ -34389,14 +49617,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_avx512f_standalone") {
++  source_set("f32-vsigmoid_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c"
++      "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" ]
@@ -34420,16 +49650,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_sse2-no-sse3") {
++  source_set("f32-vsigmoid_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -34450,16 +49680,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_sse2-no-sse3_standalone") {
++  source_set("f32-vsigmoid_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -34483,14 +49713,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_x64") {
++  source_set("f32-vsigmoid_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34511,14 +49741,79 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_x64_standalone") {
++  source_set("f32-vsigmoid_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/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-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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# 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" ]
@@ -34542,17 +49837,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vsin_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.c"
++      "src/src/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34573,17 +49865,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vsin_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.c"
++      "src/src/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34607,14 +49896,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_avx512f") {
++  source_set("f32-vsin_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c"
++      "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34635,14 +49926,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_avx512f_standalone") {
++  source_set("f32-vsin_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c"
++      "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34666,16 +49959,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_f16c-fma-no-avx2") {
++  source_set("f32-vsin_sse2-no-sse3") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.c"
++      "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" ]
@@ -34696,16 +49989,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_f16c-fma-no-avx2_standalone") {
++  source_set("f32-vsin_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.c"
++      "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" ]
@@ -34729,16 +50022,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_sse2-no-sse3") {
++  source_set("f32-vsin_x64") {
 +    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"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34759,16 +50050,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_sse2-no-sse3_standalone") {
++  source_set("f32-vsin_x64_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"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34792,14 +50081,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_x64") {
++  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-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "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" ]
@@ -34820,14 +50113,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_x64_standalone") {
++  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-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "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" ]
@@ -34851,19 +50148,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vsqrt_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    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"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34884,19 +50176,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vsqrt_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    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"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34920,16 +50207,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vunary_avx512f") {
++  source_set("f32-vsqrt_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -34950,16 +50237,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_avx512f_standalone") {
++  source_set("f32-vsqrt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -34983,17 +50270,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vunary_sse2-no-sse3") {
++  source_set("f32-vsqrt_x64") {
 +    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"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35014,17 +50298,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_sse2-no-sse3_standalone") {
++  source_set("f32-vsqrt_x64_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"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35048,16 +50329,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vunary_x64") {
++  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-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35078,16 +50360,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_x64_standalone") {
++  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-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35111,36 +50394,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("operators_x64") {
++  source_set("f32-vtanh_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35161,36 +50422,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("operators_x64_standalone") {
++  source_set("f32-vtanh_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35214,17 +50453,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-bf16-qb4w-gemm_f16c-fma-avx2") {
++  source_set("f32-vtanh_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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"
++      "src/src/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35245,17 +50483,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vtanh_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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"
++      "src/src/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35279,15 +50516,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-bf16-qb4w-gemm_x64") {
++  source_set("f32-vtanh_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -35308,15 +50546,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-bf16-qb4w-gemm_x64_standalone") {
++  source_set("f32-vtanh_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -35340,17 +50579,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2") {
++  source_set("f32-vtanh_x64") {
 +    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"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35371,17 +50607,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2_standalone") {
++  source_set("f32-vtanh_x64_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"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35405,19 +50638,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -35438,19 +50671,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -35474,17 +50707,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_f16c-fma-avx2") {
++  source_set("f32-vunary_avx512f") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -35505,17 +50737,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vunary_avx512f_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -35539,14 +50770,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_x64") {
++  source_set("f32-vunary_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
++      "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" ]
@@ -35567,14 +50801,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc2w-gemm_x64_standalone") {
++  source_set("f32-vunary_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
++      "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" ]
@@ -35598,19 +50835,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vunary_x64") {
 +    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"
++      "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" ]
@@ -35631,19 +50865,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f32-vunary_x64_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"
++      "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" ]
@@ -35667,17 +50898,36 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx2") {
++  source_set("operators_x64") {
 +    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"
++      "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" ]
@@ -35698,17 +50948,36 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("operators_x64_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"
++      "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" ]
@@ -35732,21 +51001,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-bf16-qb4w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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"
++      "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" ]
@@ -35767,21 +51032,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-bf16-qb4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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"
++      "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" ]
@@ -35805,22 +51066,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-bf16-qb4w-gemm_x64") {
 +    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"
++      "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" ]
@@ -35841,22 +51095,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-bf16-qb4w-gemm_x64_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"
++      "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" ]
@@ -35880,19 +51127,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -35913,19 +51158,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -35949,17 +51192,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx2") {
++  source_set("qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -35980,17 +51225,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -36014,21 +51261,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f16-qc2w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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"
++      "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" ]
@@ -36049,21 +51292,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc2w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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"
++      "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" ]
@@ -36087,100 +51326,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-f16-qc2w-gemm_x64") {
 +    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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_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_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" ]
-+    }
-+  }
-+}
-+
-+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"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36201,25 +51354,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc2w-gemm_x64_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"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36243,7 +51385,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -36254,8 +51396,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36276,7 +51418,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -36287,8 +51429,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36312,7 +51454,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -36321,8 +51463,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36343,7 +51485,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -36352,8 +51494,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36377,7 +51519,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -36390,8 +51532,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36412,7 +51554,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -36425,8 +51567,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36450,7 +51592,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -36464,8 +51606,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36486,7 +51628,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -36500,8 +51642,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36525,16 +51667,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -36542,8 +51678,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36564,16 +51700,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -36581,8 +51711,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36606,18 +51736,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -36638,18 +51767,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -36673,17 +51801,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx2") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-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"
++      "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" ]
@@ -36704,17 +51836,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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"
++      "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" ]
@@ -36738,7 +51874,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -36752,8 +51888,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36774,7 +51910,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -36788,8 +51924,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36813,9 +51949,11 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mavx512bw",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
@@ -36828,8 +51966,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36850,9 +51988,11 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mavx512bw",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
@@ -36865,8 +52005,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -36890,16 +52030,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_sse2-no-sse3") {
++  source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -36920,16 +52063,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -36953,16 +52099,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -36983,16 +52130,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37016,15 +52164,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_x64") {
++  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-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-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" ]
@@ -37045,15 +52199,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_x64_standalone") {
++  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-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-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" ]
@@ -37077,19 +52237,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37110,19 +52273,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37146,17 +52312,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mavx2",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37177,17 +52351,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37211,16 +52393,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_ssse3-no-sse4.1") {
++  source_set("qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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"
++      "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" ]
@@ -37241,16 +52425,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37274,14 +52460,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_x64") {
++  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
++      "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" ]
@@ -37302,14 +52491,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc2w-gemm_x64_standalone") {
++  source_set("qd8-f32-qb4w-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-1x2-minmax-scalar.c"
++      "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" ]
@@ -37333,19 +52525,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37366,19 +52561,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37402,17 +52600,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx2") {
++  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37433,17 +52637,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx2_standalone") {
++  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37467,23 +52677,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qb4w-gemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37504,23 +52707,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f32-qb4w-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37544,22 +52740,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37580,22 +52770,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37619,23 +52803,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
++  source_set("qd8-f32-qb4w-gemm_x64") {
 +    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"
++      "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" ]
@@ -37656,23 +52832,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
++  source_set("qd8-f32-qb4w-gemm_x64_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"
++      "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" ]
@@ -37696,16 +52864,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -37713,8 +52875,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -37735,16 +52897,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
++  source_set("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -37752,8 +52908,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -37777,16 +52933,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_sse2-no-sse3") {
++  source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37807,16 +52964,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_sse2-no-sse3_standalone") {
++  source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -37840,7 +52998,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1") {
++  source_set("qd8-f32-qc2w-gemm_ssse3-no-sse4.1") {
 +    cflags = [
 +      "-mno-sse4.1",
 +    "-mssse3"
@@ -37848,8 +53006,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -37870,7 +53028,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1_standalone") {
++  source_set("qd8-f32-qc2w-gemm_ssse3-no-sse4.1_standalone") {
 +    cflags = [
 +      "-mno-sse4.1",
 +    "-mssse3"
@@ -37878,8 +53036,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -37903,15 +53061,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_x64") {
++  source_set("qd8-f32-qc2w-gemm_x64") {
 +    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-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37932,15 +53089,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_x64_standalone") {
++  source_set("qd8-f32-qc2w-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"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37964,7 +53120,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -37975,8 +53131,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -37997,7 +53153,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -38008,8 +53164,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -38033,7 +53189,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -38042,8 +53198,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -38064,7 +53220,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2_standalone") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -38073,8 +53229,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -38098,7 +53254,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -38111,10 +53267,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -38135,7 +53291,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -38148,10 +53304,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -38175,7 +53331,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -38189,8 +53345,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -38211,7 +53367,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -38225,8 +53381,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -38250,11 +53406,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
++      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
@@ -38267,8 +53421,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -38289,11 +53443,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
++      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
@@ -38306,8 +53458,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -38331,16 +53483,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_sse2-no-sse3") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-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-1x4c8-minmax-sse2-ld64.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4c8-minmax-sse2-ld64.c"
++      "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" ]
@@ -38361,16 +53522,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_sse2-no-sse3_standalone") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-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-1x4c8-minmax-sse2-ld64.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4c8-minmax-sse2-ld64.c"
++      "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" ]
@@ -38394,16 +53564,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2") {
++  source_set("qd8-f32-qc4w-gemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -38424,16 +53594,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
++  source_set("qd8-f32-qc4w-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -38457,16 +53627,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_x64") {
++  source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-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" ]
@@ -38487,16 +53657,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_x64_standalone") {
++  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-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-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" ]
@@ -38520,19 +53690,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f32-qc4w-gemm_x64") {
 +    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"
++      "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" ]
@@ -38553,19 +53719,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qd8-f32-qc4w-gemm_x64_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"
++      "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" ]
@@ -38589,17 +53751,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2") {
++  source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -38620,17 +53784,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2_standalone") {
++  source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -38654,23 +53820,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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"
++      "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" ]
@@ -38691,23 +53851,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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"
++      "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" ]
@@ -38731,22 +53885,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    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"
++      "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" ]
@@ -38767,22 +53922,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_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"
++      "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" ]
@@ -38806,25 +53962,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
++      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
 +    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -38845,88 +53998,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
++      "-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" ]
-+    }
-+  }
-+}
-+
-+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" ]
-+  }
-+}
-+
-+# 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"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -38950,16 +54037,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-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-1x4c8-minmax-sse41-ld64.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse41-ld64.c"
++      "src/src/qd8-f32-qc8w-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" ]
@@ -38980,16 +54076,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-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-1x4c8-minmax-sse41-ld64.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse41-ld64.c"
++      "src/src/qd8-f32-qc8w-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" ]
@@ -39013,16 +54118,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_x64") {
++  source_set("qd8-f32-qc8w-gemm_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-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" ]
@@ -39043,16 +54148,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_x64_standalone") {
++  source_set("qd8-f32-qc8w-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-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" ]
@@ -39076,18 +54181,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c"
++      "src/src/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" ]
@@ -39108,18 +54211,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c"
++      "src/src/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" ]
@@ -39143,17 +54244,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_f16c-fma-avx2") {
++  source_set("qd8-f32-qc8w-gemm_x64") {
 +    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"
++      "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" ]
@@ -39174,17 +54274,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_f16c-fma-avx2_standalone") {
++  source_set("qd8-f32-qc8w-gemm_x64_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"
++      "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" ]
@@ -39208,21 +54307,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c"
++      "src/src/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" ]
@@ -39243,21 +54340,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c"
++      "src/src/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" ]
@@ -39281,16 +54376,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_sse2-no-sse3") {
++  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c"
++      "src/src/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" ]
@@ -39311,16 +54407,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_sse2-no-sse3_standalone") {
++  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c"
++      "src/src/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" ]
@@ -39344,16 +54441,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_sse4.1-no-sse4.2") {
++  source_set("qd8-f32-qc8w-igemm_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/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c"
++      "src/src/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" ]
@@ -39374,16 +54478,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_sse4.1-no-sse4.2_standalone") {
++  source_set("qd8-f32-qc8w-igemm_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/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c"
++      "src/src/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" ]
@@ -39407,17 +54518,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_x64") {
++  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/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/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" ]
@@ -39438,17 +54554,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_x64_standalone") {
++  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/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/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" ]
@@ -39472,16 +54593,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f16-vcvt_f16c-fma-avx2") {
++  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mavx2",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c"
++      "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" ]
@@ -39502,16 +54632,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f16-vcvt_f16c-fma-avx2_standalone") {
++  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c"
++      "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" ]
@@ -39535,17 +54674,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qd8-f32-qc8w-igemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c"
++      "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" ]
@@ -39566,17 +54704,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qd8-f32-qc8w-igemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c"
++      "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" ]
@@ -39600,16 +54737,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_f16c-fma-avx2") {
++  source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c"
++      "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" ]
@@ -39630,16 +54767,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_f16c-fma-avx2_standalone") {
++  source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c"
++      "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" ]
@@ -39663,86 +54800,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +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",
-+    ]
-+
-+    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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f32-qc8w-igemm_x64") {
 +    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" ]
-+    }
-+  }
-+}
-+
-+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"
++      "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" ]
@@ -39763,15 +54830,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_sse2-no-sse3_standalone") {
++  source_set("qd8-f32-qc8w-igemm_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.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" ]
@@ -39795,15 +54863,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_sse4.1-no-sse4.2") {
++  source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c"
++      "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" ]
@@ -39824,15 +54895,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c"
++      "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" ]
@@ -39856,14 +54930,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_x64") {
++  source_set("qs8-dwconv_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx2-mul32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39884,14 +54961,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_x64_standalone") {
++  source_set("qs8-dwconv_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx2-mul32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39915,19 +54995,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni-prfm.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c"
++      "src/src/qs8-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" ]
@@ -39948,19 +55030,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni-prfm.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c"
++      "src/src/qs8-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" ]
@@ -39984,17 +55068,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_f16c-fma-avx2") {
++  source_set("qs8-dwconv_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -40015,17 +55098,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_f16c-fma-avx2_standalone") {
++  source_set("qs8-dwconv_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -40049,23 +55131,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-dwconv_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx256vnni-prfm.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x64c4-gemm-goi-avx256vnni-prfm.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx256vnni-prfm.c"
++      "src/src/qs8-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" ]
@@ -40086,23 +55161,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qs8-dwconv_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx256vnni-prfm.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x64c4-gemm-goi-avx256vnni-prfm.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx256vnni-prfm.c"
++      "src/src/qs8-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" ]
@@ -40126,20 +55194,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_x64") {
++  source_set("qs8-dwconv_x64") {
 +    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-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" ]
@@ -40160,20 +55225,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_x64_standalone") {
++  source_set("qs8-dwconv_x64_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-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" ]
@@ -40197,19 +55259,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-f16-vcvt_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40230,19 +55289,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-f16-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40266,17 +55322,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_f16c-fma-avx2") {
++  source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40297,17 +55353,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_f16c-fma-avx2_standalone") {
++  source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40331,21 +55387,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-f32-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40366,21 +55417,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-f32-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40404,16 +55450,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_ssse3-no-sse4.1") {
++  source_set("qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40434,16 +55484,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40467,17 +55521,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_x64") {
++  source_set("qs8-f32-vcvt_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40498,17 +55550,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_x64_standalone") {
++  source_set("qs8-f32-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40532,18 +55582,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-f32-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-avx-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-avx-madd-prfm.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40564,18 +55611,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-f32-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-avx-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-avx-madd-prfm.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40599,19 +55643,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-f32-vcvt_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40632,19 +55671,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
++  source_set("qs8-f32-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40668,17 +55702,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx2") {
++  source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-avx2-madd-prfm.c"
++      "src/src/qs8-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" ]
@@ -40699,17 +55735,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx2_standalone") {
++  source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-avx2-madd-prfm.c"
++      "src/src/qs8-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" ]
@@ -40733,23 +55771,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-packw_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16c8-minmax-fp32-avx512skx-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256skx-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x16c8-minmax-fp32-avx512skx-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256skx-madd-prfm.c"
++      "src/src/qs8-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" ]
@@ -40770,23 +55802,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-packw_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16c8-minmax-fp32-avx512skx-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256skx-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x16c8-minmax-fp32-avx512skx-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256skx-madd-prfm.c"
++      "src/src/qs8-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" ]
@@ -40810,7 +55836,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -40824,8 +55850,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256vnni-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256vnni-prfm.c"
++      "src/src/qs8-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" ]
@@ -40846,7 +55873,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
++  source_set("qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -40860,8 +55887,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256vnni-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256vnni-prfm.c"
++      "src/src/qs8-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" ]
@@ -40885,16 +55913,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_ssse3-no-sse4.1") {
++  source_set("qs8-packw_x64") {
 +    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"
++      "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" ]
@@ -40915,16 +55947,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_ssse3-no-sse4.1_standalone") {
++  source_set("qs8-packw_x64_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"
++      "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" ]
@@ -40948,15 +55984,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_x64") {
++  source_set("qs8-qc2w-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-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c"
++      "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" ]
@@ -40977,15 +56017,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_x64_standalone") {
++  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-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-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" ]
@@ -41009,19 +56053,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-packw_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-qc2w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -41042,19 +56084,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc2w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -41078,24 +56118,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-qc2w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    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"
++      "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" ]
@@ -41116,24 +56153,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc2w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_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"
++      "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" ]
@@ -41157,18 +56191,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-packw_sse2-no-sse3") {
++  source_set("qs8-qc2w-gemm_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -41189,18 +56221,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-packw_sse2-no-sse3_standalone") {
++  source_set("qs8-qc2w-gemm_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -41224,15 +56254,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-packw_x64") {
++  source_set("qs8-qc2w-gemm_x64") {
 +    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"
++      "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" ]
@@ -41253,15 +56285,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-packw_x64_standalone") {
++  source_set("qs8-qc2w-gemm_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"
++      "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" ]
@@ -41285,7 +56319,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -41295,9 +56329,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c"
++      "src/src/qs8-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" ]
@@ -41318,7 +56351,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -41328,9 +56361,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c"
++      "src/src/qs8-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" ]
@@ -41354,18 +56386,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_f16c-fma-avx2") {
++  source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx2-mul32.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx2-mul32.c"
++      "src/src/qs8-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" ]
@@ -41386,18 +56419,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_f16c-fma-avx2_standalone") {
++  source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx2-mul32.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx2-mul32.c"
++      "src/src/qs8-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" ]
@@ -41421,22 +56455,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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"
++      "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" ]
@@ -41457,22 +56486,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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"
++      "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" ]
@@ -41496,17 +56520,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_sse2-no-sse3") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c"
++      "src/src/qs8-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" ]
@@ -41527,17 +56557,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_sse2-no-sse3_standalone") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c"
++      "src/src/qs8-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" ]
@@ -41561,17 +56597,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c"
++      "src/src/qs8-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" ]
@@ -41592,17 +56633,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c"
++      "src/src/qs8-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" ]
@@ -41626,19 +56672,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_x64") {
++  source_set("qs8-qc4w-gemm_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-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" ]
@@ -41659,19 +56702,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_x64_standalone") {
++  source_set("qs8-qc4w-gemm_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-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" ]
@@ -41695,18 +56735,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qc4w-gemm_x64") {
 +    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"
++      "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" ]
@@ -41727,18 +56764,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc4w-gemm_x64_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"
++      "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" ]
@@ -41762,7 +56796,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-qc4w-packw_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -41773,8 +56807,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -41795,7 +56829,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc4w-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -41806,8 +56840,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -41831,19 +56865,24 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") {
++  source_set("qs8-qc4w-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnniint8",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -41864,19 +56903,24 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc4w-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnniint8",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -41900,17 +56944,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx2") {
++  source_set("qs8-qc4w-packw_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -41931,17 +56976,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx2_standalone") {
++  source_set("qs8-qc4w-packw_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -41965,23 +57011,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc4w-packw_x64") {
 +    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"
++      "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" ]
@@ -42002,23 +57040,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc4w-packw_x64_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"
++      "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" ]
@@ -42042,22 +57072,87 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-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",
++    ]
++
++    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" ]
++    }
++  }
++}
++
++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-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"
++      "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" ]
@@ -42078,22 +57173,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-dwconv_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-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"
++      "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" ]
@@ -42117,25 +57208,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
++      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
-+    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -42156,25 +57244,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
++      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
-+    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -42198,7 +57283,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_sse2-no-sse3") {
++  source_set("qs8-qc8w-dwconv_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -42206,8 +57291,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42228,7 +57314,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_sse2-no-sse3_standalone") {
++  source_set("qs8-qc8w-dwconv_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -42236,8 +57322,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42261,7 +57348,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2") {
++  source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -42269,8 +57356,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42291,7 +57379,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -42299,8 +57387,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42324,15 +57413,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_x64") {
++  source_set("qs8-qc8w-dwconv_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "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" ]
@@ -42353,15 +57446,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_x64_standalone") {
++  source_set("qs8-qc8w-dwconv_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"
++      "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" ]
@@ -42385,7 +57482,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -42395,8 +57492,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42417,7 +57514,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -42427,8 +57524,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42452,7 +57549,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -42463,8 +57560,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42485,7 +57582,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -42496,8 +57593,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42521,7 +57618,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni") {
++  source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnniint8",
@@ -42532,8 +57629,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42554,7 +57651,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnniint8",
@@ -42565,8 +57662,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42590,7 +57687,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx2") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -42599,8 +57696,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42621,7 +57718,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx2_standalone") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -42630,8 +57727,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42655,7 +57752,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -42668,10 +57765,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42692,7 +57789,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -42705,10 +57802,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42732,7 +57829,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -42746,8 +57843,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -42768,7 +57865,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -42782,152 +57879,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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("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",
-+    ]
-+
-+    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_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" ]
-+    }
-+  }
-+}
-+
-+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("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"
++      "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" ]
@@ -42951,16 +57904,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-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-1x4c8-minmax-fp32-sse41-ld64.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-sse41-ld64.c"
++      "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" ]
@@ -42981,16 +57943,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-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-1x4c8-minmax-fp32-sse41-ld64.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-sse41-ld64.c"
++      "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" ]
@@ -43014,15 +57985,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_x64") {
++  source_set("qs8-qc8w-gemm_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-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" ]
@@ -43043,15 +58015,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_x64_standalone") {
++  source_set("qs8-qc8w-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-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" ]
@@ -43075,18 +58048,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c"
++      "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" ]
@@ -43107,18 +58078,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c"
++      "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" ]
@@ -43142,21 +58111,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-qc8w-gemm_x64") {
 +    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"
++      "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" ]
@@ -43177,21 +58140,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-gemm_x64_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"
++      "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" ]
@@ -43215,15 +58172,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_x64") {
++  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-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-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" ]
@@ -43244,15 +58204,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qu8-packw_x64_standalone") {
++  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-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-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" ]
@@ -43276,16 +58239,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_f16c-fma-avx2") {
++  source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.c"
++      "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" ]
@@ -43306,16 +58272,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_f16c-fma-avx2_standalone") {
++  source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.c"
++      "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" ]
@@ -43339,20 +58308,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
++    "-mavxvnniint8",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.c"
++      "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" ]
@@ -43373,20 +58341,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
++    "-mavxvnniint8",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.c"
++      "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" ]
@@ -43410,15 +58377,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_sse4.1-no-sse4.2") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.c"
++      "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" ]
@@ -43439,15 +58408,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.c"
++      "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" ]
@@ -43471,14 +58442,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_x64") {
++  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-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "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" ]
@@ -43499,14 +58479,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_x64_standalone") {
++  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-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "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" ]
@@ -43530,18 +58519,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.c"
++      "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" ]
@@ -43562,18 +58555,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.c"
++      "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" ]
@@ -43597,16 +58594,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_f16c-fma-avx2") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mavx2",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.c"
++      "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" ]
@@ -43627,16 +58633,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_f16c-fma-avx2_standalone") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.c"
++      "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" ]
@@ -43660,21 +58675,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc8w-igemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -43695,21 +58705,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-igemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -43733,21 +58738,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.c"
++      "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" ]
@@ -43768,21 +58768,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.c"
++      "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" ]
@@ -43806,15 +58801,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_ssse3-no-sse4.1") {
++  source_set("qs8-qc8w-igemm_x64") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43835,15 +58830,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_ssse3-no-sse4.1_standalone") {
++  source_set("qs8-qc8w-igemm_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43867,14 +58862,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_x64") {
++  source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43895,14 +58894,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_x64_standalone") {
++  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-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43926,17 +58929,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43957,17 +58964,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43991,16 +59002,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_f16c-fma-avx2") {
++  source_set("qs8-qu8-packw_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-u16.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44021,16 +59031,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_f16c-fma-avx2_standalone") {
++  source_set("qs8-qu8-packw_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-u16.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44054,20 +59063,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-rdsum_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44088,20 +59093,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-rdsum_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44125,15 +59126,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_sse2-no-sse3") {
++  source_set("qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44154,15 +59160,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_sse2-no-sse3_standalone") {
++  source_set("qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44186,7 +59197,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_sse4.1-no-sse4.2") {
++  source_set("qs8-rdsum_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -44194,7 +59205,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44215,7 +59226,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-rdsum_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -44223,7 +59234,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44247,15 +59258,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_x64") {
++  source_set("qs8-rdsum_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"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44276,15 +59286,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_x64_standalone") {
++  source_set("qs8-rdsum_x64_standalone") {
 +    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"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44308,17 +59317,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44339,17 +59349,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44373,7 +59384,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_f16c-fma-avx2") {
++  source_set("qs8-rsum_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -44382,7 +59393,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44403,7 +59414,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_f16c-fma-avx2_standalone") {
++  source_set("qs8-rsum_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -44412,7 +59423,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44436,7 +59447,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -44449,7 +59460,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
++      "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" ]
@@ -44470,7 +59482,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -44483,7 +59495,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
++      "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" ]
@@ -44507,15 +59520,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_sse2-no-sse3") {
++  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44536,15 +59555,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_sse2-no-sse3_standalone") {
++  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44568,15 +59593,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_sse4.1-no-sse4.2") {
++  source_set("qs8-rsum_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44597,15 +59622,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-rsum_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44629,15 +59654,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_x64") {
++  source_set("qs8-rsum_x64") {
 +    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"
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44658,15 +59682,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_x64_standalone") {
++  source_set("qs8-rsum_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"
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44690,7 +59713,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -44700,7 +59723,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44721,7 +59744,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -44731,7 +59754,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44755,7 +59778,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_f16c-fma-avx2") {
++  source_set("qs8-vadd_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -44764,7 +59787,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44785,7 +59808,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_f16c-fma-avx2_standalone") {
++  source_set("qs8-vadd_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -44794,7 +59817,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44818,15 +59841,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_sse2-no-sse3") {
++  source_set("qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44847,15 +59875,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_sse2-no-sse3_standalone") {
++  source_set("qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44879,15 +59912,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_sse4.1-no-sse4.2") {
++  source_set("qs8-vadd_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44908,15 +59941,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-vadd_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44940,15 +59973,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_ssse3-no-sse4.1") {
++  source_set("qs8-vadd_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44969,15 +60002,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_ssse3-no-sse4.1_standalone") {
++  source_set("qs8-vadd_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45001,14 +60034,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_x64") {
++  source_set("qs8-vadd_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "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" ]
@@ -45029,14 +60063,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_x64_standalone") {
++  source_set("qs8-vadd_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "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" ]
@@ -45060,7 +60095,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -45070,7 +60105,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45091,7 +60126,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -45101,7 +60136,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45125,7 +60160,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_f16c-fma-avx2") {
++  source_set("qs8-vaddc_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -45134,7 +60169,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45155,7 +60190,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_f16c-fma-avx2_standalone") {
++  source_set("qs8-vaddc_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -45164,68 +60199,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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" ]
-+    }
-+  }
-+}
-+
-+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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_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"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45249,15 +60223,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_sse4.1-no-sse4.2") {
++  source_set("qs8-vaddc_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/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45278,15 +60257,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-vaddc_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/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45310,15 +60294,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_ssse3-no-sse4.1") {
++  source_set("qs8-vaddc_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45339,15 +60323,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_ssse3-no-sse4.1_standalone") {
++  source_set("qs8-vaddc_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45371,14 +60355,76 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_x64") {
++  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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# 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-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "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" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qs8-vaddc_x64") {
++    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" ]
@@ -45399,14 +60445,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_x64_standalone") {
++  source_set("qs8-vaddc_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "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" ]
@@ -45430,7 +60477,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -45440,7 +60487,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45461,7 +60508,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -45471,7 +60518,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45495,15 +60542,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_sse2-no-sse3") {
++  source_set("qs8-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45524,15 +60572,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_sse2-no-sse3_standalone") {
++  source_set("qs8-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45556,15 +60605,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_sse4.1-no-sse4.2") {
++  source_set("qs8-vcvt_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45585,15 +60634,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45617,14 +60666,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_x64") {
++  source_set("qs8-vcvt_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-scalar-u4.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45645,14 +60695,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_x64_standalone") {
++  source_set("qs8-vcvt_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-scalar-u4.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45676,17 +60727,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vcvt_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45707,17 +60756,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-vcvt_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45741,15 +60788,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_sse2-no-sse3") {
++  source_set("qs8-vcvt_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45770,15 +60816,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_sse2-no-sse3_standalone") {
++  source_set("qs8-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45802,15 +60847,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_sse4.1-no-sse4.2") {
++  source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45831,15 +60878,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45863,14 +60912,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_x64") {
++  source_set("qs8-vlrelu_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45891,14 +60942,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_x64_standalone") {
++  source_set("qs8-vlrelu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45922,16 +60975,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_f16c-fma-avx2") {
++  source_set("qs8-vlrelu_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45952,16 +61004,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vprelu_f16c-fma-avx2_standalone") {
++  source_set("qs8-vlrelu_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45985,14 +61036,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_x64") {
++  source_set("qs8-vlrelu_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46013,14 +61065,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vprelu_x64_standalone") {
++  source_set("qs8-vlrelu_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46044,16 +61097,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_f16c-fma-avx2") {
++  source_set("qs8-vlrelu_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46074,16 +61126,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vpreluc_f16c-fma-avx2_standalone") {
++  source_set("qs8-vlrelu_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46107,14 +61158,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_x64") {
++  source_set("qs8-vlrelu_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46135,14 +61186,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vpreluc_x64_standalone") {
++  source_set("qs8-vlrelu_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46166,16 +61217,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_f16c-fma-avx2") {
++  source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46196,16 +61248,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vrpreluc_f16c-fma-avx2_standalone") {
++  source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46229,14 +61282,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_x64") {
++  source_set("qs8-vmul_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46257,14 +61311,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vrpreluc_x64_standalone") {
++  source_set("qs8-vmul_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46288,18 +61343,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vmul_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46320,18 +61372,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-vmul_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46355,17 +61404,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_f16c-fma-avx2") {
++  source_set("qs8-vmul_x64") {
 +    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"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46386,17 +61432,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_f16c-fma-avx2_standalone") {
++  source_set("qs8-vmul_x64_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"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46420,21 +61463,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46455,21 +61494,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46493,7 +61528,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_sse2-no-sse3") {
++  source_set("qs8-vmulc_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -46501,8 +61536,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46523,7 +61557,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_sse2-no-sse3_standalone") {
++  source_set("qs8-vmulc_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -46531,8 +61565,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46556,7 +61589,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_sse4.1-no-sse4.2") {
++  source_set("qs8-vmulc_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -46564,8 +61597,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46586,7 +61618,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-vmulc_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -46594,8 +61626,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46619,17 +61650,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_x64") {
++  source_set("qs8-vmulc_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46650,17 +61678,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_x64_standalone") {
++  source_set("qs8-vmulc_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46684,17 +61709,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vprelu_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46715,17 +61739,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-vprelu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46749,7 +61772,66 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_f16c-fma-avx2") {
++  source_set("qs8-vprelu_x64") {
++    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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# 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("qs8-vpreluc_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -46758,7 +61840,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46779,7 +61861,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_f16c-fma-avx2_standalone") {
++  source_set("qs8-vpreluc_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -46788,7 +61870,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46812,86 +61894,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +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",
-+    ]
-+
-+    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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-vpreluc_x64") {
 +    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" ]
-+    }
-+  }
-+}
-+
-+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"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46912,15 +61922,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_sse2-no-sse3_standalone") {
++  source_set("qs8-vpreluc_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46944,15 +61953,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_sse4.1-no-sse4.2") {
++  source_set("qs8-vrpreluc_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46973,15 +61983,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qs8-vrpreluc_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47005,14 +62016,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_x64") {
++  source_set("qs8-vrpreluc_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47033,14 +62044,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_x64_standalone") {
++  source_set("qs8-vrpreluc_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47064,7 +62075,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -47074,8 +62085,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -47096,7 +62107,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -47106,8 +62117,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -47131,7 +62142,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_f16c-fma-avx2") {
++  source_set("qu8-dwconv_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -47140,8 +62151,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -47162,7 +62173,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_f16c-fma-avx2_standalone") {
++  source_set("qu8-dwconv_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -47171,8 +62182,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -47196,7 +62207,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -47209,8 +62220,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -47231,7 +62242,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -47244,8 +62255,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -47269,7 +62280,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_sse2-no-sse3") {
++  source_set("qu8-dwconv_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -47277,8 +62288,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -47299,7 +62310,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_sse2-no-sse3_standalone") {
++  source_set("qu8-dwconv_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -47307,8 +62318,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -47332,7 +62343,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_sse4.1-no-sse4.2") {
++  source_set("qu8-dwconv_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -47340,8 +62351,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -47362,7 +62373,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qu8-dwconv_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -47370,8 +62381,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -47395,15 +62406,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_x64") {
++  source_set("qu8-dwconv_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"
++      "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" ]
@@ -47424,15 +62437,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_x64_standalone") {
++  source_set("qu8-dwconv_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "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" ]
@@ -47456,7 +62471,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -47466,8 +62481,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47488,7 +62502,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -47498,8 +62512,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47523,7 +62536,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_f16c-fma-avx2") {
++  source_set("qu8-f32-vcvt_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -47532,8 +62545,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47554,7 +62566,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_f16c-fma-avx2_standalone") {
++  source_set("qu8-f32-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -47563,8 +62575,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47588,7 +62599,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -47601,8 +62612,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47623,7 +62633,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -47636,8 +62646,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47661,7 +62670,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_sse2-no-sse3") {
++  source_set("qu8-f32-vcvt_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -47669,8 +62678,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47691,7 +62699,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_sse2-no-sse3_standalone") {
++  source_set("qu8-f32-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -47699,8 +62707,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47724,7 +62731,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_sse4.1-no-sse4.2") {
++  source_set("qu8-f32-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -47732,8 +62739,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47754,7 +62760,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qu8-f32-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -47762,8 +62768,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47787,15 +62792,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_x64") {
++  source_set("qu8-f32-vcvt_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47816,15 +62820,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_x64_standalone") {
++  source_set("qu8-f32-vcvt_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"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47848,15 +62851,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_ssse3-no-sse4.1") {
++  source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
++      "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" ]
@@ -47877,15 +62883,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_ssse3-no-sse4.1_standalone") {
++  source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
++      "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" ]
@@ -47909,14 +62918,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_x64") {
++  source_set("qu8-gemm_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "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" ]
@@ -47937,14 +62949,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_x64_standalone") {
++  source_set("qu8-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "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" ]
@@ -47968,16 +62983,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_f16c-fma-avx2") {
++  source_set("qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
++      "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" ]
@@ -47998,16 +63018,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_f16c-fma-avx2_standalone") {
++  source_set("qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
++      "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" ]
@@ -48031,7 +63056,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_sse2-no-sse3") {
++  source_set("qu8-gemm_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -48039,7 +63064,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
++      "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" ]
@@ -48060,7 +63086,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_sse2-no-sse3_standalone") {
++  source_set("qu8-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -48068,7 +63094,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
++      "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" ]
@@ -48092,14 +63119,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_x64") {
++  source_set("qu8-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "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" ]
@@ -48120,14 +63149,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_x64_standalone") {
++  source_set("qu8-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "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" ]
@@ -48151,17 +63182,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-gemm_x64") {
 +    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"
++      "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" ]
@@ -48182,17 +63211,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qu8-gemm_x64_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"
++      "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" ]
@@ -48216,16 +63243,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_f16c-fma-avx2") {
++  source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c"
++      "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" ]
@@ -48246,16 +63275,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_f16c-fma-avx2_standalone") {
++  source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c"
++      "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" ]
@@ -48279,20 +63310,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qu8-igemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
++      "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" ]
@@ -48313,20 +63341,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qu8-igemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
++      "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" ]
@@ -48350,15 +63375,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_sse2-no-sse3") {
++  source_set("qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c"
++      "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" ]
@@ -48379,15 +63410,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_sse2-no-sse3_standalone") {
++  source_set("qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c"
++      "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" ]
@@ -48411,15 +63448,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_sse4.1-no-sse4.2") {
++  source_set("qu8-igemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c"
++      "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" ]
@@ -48440,15 +63478,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qu8-igemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c"
++      "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" ]
@@ -48472,15 +63511,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_x64") {
++  source_set("qu8-igemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -48501,15 +63541,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_x64_standalone") {
++  source_set("qu8-igemm_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-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "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" ]
@@ -48533,17 +63574,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-igemm_x64") {
 +    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"
++      "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" ]
@@ -48564,17 +63603,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qu8-igemm_x64_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"
++      "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" ]
@@ -48598,16 +63635,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_f16c-fma-avx2") {
++  source_set("qu8-rdsum_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48628,16 +63664,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_f16c-fma-avx2_standalone") {
++  source_set("qu8-rdsum_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48661,20 +63696,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qu8-rdsum_x64") {
 +    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"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48695,20 +63724,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qu8-rdsum_x64_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"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48732,15 +63755,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_sse2-no-sse3") {
++  source_set("qu8-rsum_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48761,15 +63785,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_sse2-no-sse3_standalone") {
++  source_set("qu8-rsum_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48793,15 +63818,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_sse4.1-no-sse4.2") {
++  source_set("qu8-rsum_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48822,15 +63847,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qu8-rsum_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48854,15 +63879,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_x64") {
++  source_set("qu8-rsum_x64") {
 +    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"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48883,15 +63907,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_x64_standalone") {
++  source_set("qu8-rsum_x64_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"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48915,7 +63938,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -48925,7 +63948,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48946,7 +63969,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -48956,7 +63979,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48980,7 +64003,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_f16c-fma-avx2") {
++  source_set("qu8-vadd_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -48989,7 +64012,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49010,7 +64033,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_f16c-fma-avx2_standalone") {
++  source_set("qu8-vadd_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -49019,7 +64042,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49043,15 +64066,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_sse2-no-sse3") {
++  source_set("qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49072,15 +64100,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_sse2-no-sse3_standalone") {
++  source_set("qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49104,15 +64137,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_sse4.1-no-sse4.2") {
++  source_set("qu8-vadd_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49133,15 +64166,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-vadd_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49165,15 +64198,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_ssse3-no-sse4.1") {
++  source_set("qu8-vadd_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49194,15 +64227,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_ssse3-no-sse4.1_standalone") {
++  source_set("qu8-vadd_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49226,14 +64259,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_x64") {
++  source_set("qu8-vadd_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "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" ]
@@ -49254,14 +64288,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_x64_standalone") {
++  source_set("qu8-vadd_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "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" ]
@@ -49285,7 +64320,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -49295,7 +64330,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49316,7 +64351,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -49326,7 +64361,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49350,7 +64385,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_f16c-fma-avx2") {
++  source_set("qu8-vaddc_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -49359,7 +64394,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49380,7 +64415,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_f16c-fma-avx2_standalone") {
++  source_set("qu8-vaddc_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -49389,68 +64424,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-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" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qu8-vlrelu_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49474,15 +64448,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_sse4.1-no-sse4.2") {
++  source_set("qu8-vaddc_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/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49503,15 +64482,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-vaddc_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/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49535,15 +64519,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_ssse3-no-sse4.1") {
++  source_set("qu8-vaddc_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49564,15 +64548,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_ssse3-no-sse4.1_standalone") {
++  source_set("qu8-vaddc_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49596,14 +64580,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_x64") {
++  source_set("qu8-vaddc_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49624,14 +64609,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_x64_standalone") {
++  source_set("qu8-vaddc_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49655,17 +64641,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-vaddc_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49686,17 +64670,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qu8-vaddc_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49720,15 +64702,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_sse2-no-sse3") {
++  source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49749,15 +64733,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_sse2-no-sse3_standalone") {
++  source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49781,15 +64767,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_sse4.1-no-sse4.2") {
++  source_set("qu8-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49810,15 +64797,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49842,14 +64830,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_x64") {
++  source_set("qu8-vcvt_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49870,14 +64859,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_x64_standalone") {
++  source_set("qu8-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49901,17 +64891,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49932,17 +64920,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qu8-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49966,15 +64952,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_sse2-no-sse3") {
++  source_set("qu8-vcvt_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49995,15 +64981,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_sse2-no-sse3_standalone") {
++  source_set("qu8-vcvt_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50027,15 +65013,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_sse4.1-no-sse4.2") {
++  source_set("qu8-vcvt_x64") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50056,15 +65041,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50088,14 +65072,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_x64") {
++  source_set("qu8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50116,14 +65103,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_x64_standalone") {
++  source_set("qu8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50147,7 +65137,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_f16c-fma-avx2") {
++  source_set("qu8-vlrelu_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -50156,7 +65146,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50177,7 +65167,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_f16c-fma-avx2_standalone") {
++  source_set("qu8-vlrelu_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -50186,66 +65176,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-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" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qu8-vprelu_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50269,16 +65200,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_f16c-fma-avx2") {
++  source_set("qu8-vlrelu_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50299,16 +65229,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vpreluc_f16c-fma-avx2_standalone") {
++  source_set("qu8-vlrelu_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50332,14 +65261,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_x64") {
++  source_set("qu8-vlrelu_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50360,14 +65290,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vpreluc_x64_standalone") {
++  source_set("qu8-vlrelu_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50391,16 +65322,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_f16c-fma-avx2") {
++  source_set("qu8-vlrelu_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50421,16 +65351,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vrpreluc_f16c-fma-avx2_standalone") {
++  source_set("qu8-vlrelu_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50454,14 +65383,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_x64") {
++  source_set("qu8-vlrelu_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50482,14 +65411,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vrpreluc_x64_standalone") {
++  source_set("qu8-vlrelu_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50513,16 +65442,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("reference_x64") {
++  source_set("qu8-vmul_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50543,16 +65473,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("reference_x64_standalone") {
++  source_set("qu8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50576,7 +65507,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_sse2-no-sse3") {
++  source_set("qu8-vmul_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -50584,7 +65515,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50605,7 +65536,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_sse2-no-sse3_standalone") {
++  source_set("qu8-vmul_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -50613,7 +65544,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50637,7 +65568,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_sse4.1-no-sse4.2") {
++  source_set("qu8-vmul_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -50645,7 +65576,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50666,7 +65597,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-vmul_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -50674,7 +65605,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50698,14 +65629,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_x64") {
++  source_set("qu8-vmul_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50726,14 +65657,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_x64_standalone") {
++  source_set("qu8-vmul_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50757,15 +65688,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_sse4.1-no-sse4.2") {
++  source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50786,15 +65719,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50818,14 +65753,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_x64") {
++  source_set("qu8-vmulc_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50846,14 +65782,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_x64_standalone") {
++  source_set("qu8-vmulc_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50877,7 +65814,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_sse4.1-no-sse4.2") {
++  source_set("qu8-vmulc_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -50885,8 +65822,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-sse41-u32.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-sse41-u32.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50907,7 +65843,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-vmulc_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -50915,8 +65851,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-sse41-u32.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-sse41-u32.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50940,15 +65875,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_x64") {
++  source_set("qu8-vmulc_x64") {
 +    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"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50969,15 +65903,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_x64_standalone") {
++  source_set("qu8-vmulc_x64_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"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51001,17 +65934,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_sse4.1-no-sse4.2") {
++  source_set("qu8-vprelu_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-sse41-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-sse41-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-sse41-u32-acc2.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51032,17 +65964,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_sse4.1-no-sse4.2_standalone") {
++  source_set("qu8-vprelu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-sse41-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-sse41-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-sse41-u32-acc2.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51066,16 +65997,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_x64") {
++  source_set("qu8-vprelu_x64") {
 +    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/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51096,16 +66025,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_x64_standalone") {
++  source_set("qu8-vprelu_x64_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/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51129,7 +66056,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_f16c-fma-avx2") {
++  source_set("qu8-vpreluc_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -51138,7 +66065,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51159,7 +66086,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_f16c-fma-avx2_standalone") {
++  source_set("qu8-vpreluc_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -51168,7 +66095,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51192,20 +66119,75 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qu8-vpreluc_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++  
++    ]
++  
++    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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# 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("qu8-vrpreluc_f16c-fma-avx2") {
++    cflags = [
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51226,20 +66208,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qu8-vrpreluc_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51263,15 +66241,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_sse2-no-sse3") {
++  source_set("qu8-vrpreluc_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse2-u64.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51292,15 +66269,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_sse2-no-sse3_standalone") {
++  source_set("qu8-vrpreluc_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse2-u64.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51324,15 +66300,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_sse4.1-no-sse4.2") {
++  source_set("reference_x64") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51353,15 +66330,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_sse4.1-no-sse4.2_standalone") {
++  source_set("reference_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51385,14 +66363,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_x64") {
++  source_set("s8-ibilinear_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51413,14 +66392,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_x64_standalone") {
++  source_set("s8-ibilinear_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51444,43 +66424,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("subgraph_x64") {
++  source_set("s8-ibilinear_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-ibilinear/gen/s8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51501,43 +66453,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("subgraph_x64_standalone") {
++  source_set("s8-ibilinear_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-ibilinear/gen/s8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51561,22 +66485,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("tables_x64") {
++  source_set("s8-ibilinear_x64") {
 +    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/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51597,83 +66513,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("tables_x64_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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/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_sse2-no-sse3") {
++  source_set("s8-ibilinear_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51697,7 +66544,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_sse4.1-no-sse4.2") {
++  source_set("s8-maxpool_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -51705,7 +66552,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51726,7 +66573,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_sse4.1-no-sse4.2_standalone") {
++  source_set("s8-maxpool_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -51734,7 +66581,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51758,14 +66605,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_x64") {
++  source_set("s8-maxpool_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51786,14 +66633,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_x64_standalone") {
++  source_set("s8-maxpool_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51817,14 +66664,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-lut32norm_x64") {
++  source_set("s8-rdminmax_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-sse41-u32.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51845,14 +66694,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-lut32norm_x64_standalone") {
++  source_set("s8-rdminmax_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-sse41-u32.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51876,15 +66727,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_sse2-no-sse3") {
++  source_set("s8-rdminmax_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51905,15 +66756,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_sse2-no-sse3_standalone") {
++  source_set("s8-rdminmax_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51937,14 +66788,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_x64") {
++  source_set("s8-rminmax_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-rminmax/gen/s8-rmax-sse41-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-sse41-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-sse41-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51965,14 +66819,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_x64_standalone") {
++  source_set("s8-rminmax_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-rminmax/gen/s8-rmax-sse41-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-sse41-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-sse41-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51996,16 +66853,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_sse2-no-sse3") {
++  source_set("s8-rminmax_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-sse2-u32.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-sse2-u32.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52026,16 +66883,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_sse2-no-sse3_standalone") {
++  source_set("s8-rminmax_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-sse2-u32.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-sse2-u32.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52059,15 +66916,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_x64") {
++  source_set("s8-vclamp_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/s8-vclamp/s8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52088,15 +66946,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_x64_standalone") {
++  source_set("s8-vclamp_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/s8-vclamp/s8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52120,17 +66979,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_sse2-no-sse3") {
++  source_set("s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-sse2-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-sse2-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-sse2-u32-acc2.c"
++      "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52151,17 +67013,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_sse2-no-sse3_standalone") {
++  source_set("s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-sse2-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-sse2-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-sse2-u32-acc2.c"
++      "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52185,16 +67050,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_x64") {
++  source_set("s8-vclamp_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/s8-vclamp/s8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52215,16 +67079,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_x64_standalone") {
++  source_set("s8-vclamp_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/s8-vclamp/s8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52248,16 +67111,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_f16c-fma-avx2") {
++  source_set("s8-vclamp_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-avx2-u128.c"
++      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52278,16 +67140,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_f16c-fma-avx2_standalone") {
++  source_set("s8-vclamp_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-avx2-u128.c"
++      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52311,20 +67172,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("s8-vclamp_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52345,20 +67200,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("s8-vclamp_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52382,15 +67231,43 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_sse2-no-sse3") {
++  source_set("subgraph_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-sse2-u64.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52411,15 +67288,43 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_sse2-no-sse3_standalone") {
++  source_set("subgraph_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-sse2-u64.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52443,14 +67348,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_x64") {
++  source_set("tables_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.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" ]
@@ -52471,14 +67384,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_x64_standalone") {
++  source_set("tables_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.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" ]
@@ -52502,17 +67423,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-packw_f16c-fma-avx2") {
++  source_set("u8-ibilinear_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52533,17 +67452,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-packw_f16c-fma-avx2_standalone") {
++  source_set("u8-ibilinear_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52567,17 +67484,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-packw_x64") {
++  source_set("u8-ibilinear_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-ibilinear/gen/u8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52598,17 +67513,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-packw_x64_standalone") {
++  source_set("u8-ibilinear_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-ibilinear/gen/u8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52632,16 +67545,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_f16c-fma-avx2") {
++  source_set("u8-ibilinear_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52662,16 +67573,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_f16c-fma-avx2_standalone") {
++  source_set("u8-ibilinear_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52695,15 +67604,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_sse2-no-sse3") {
++  source_set("u8-lut32norm_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52724,15 +67632,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_sse2-no-sse3_standalone") {
++  source_set("u8-lut32norm_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52756,14 +67663,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_x64") {
++  source_set("u8-maxpool_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52784,14 +67692,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_x64_standalone") {
++  source_set("u8-maxpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52815,15 +67724,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_x64") {
++  source_set("u8-maxpool_x64") {
 +    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/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52844,15 +67752,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-x32-packw_x64_standalone") {
++  source_set("u8-maxpool_x64_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/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52876,15 +67783,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x24-transposec_ssse3-no-sse4.1") {
++  source_set("u8-rdminmax_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/x24-transposec-4x4-ssse3.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-sse2-u32.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52905,15 +67813,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x24-transposec_ssse3-no-sse4.1_standalone") {
++  source_set("u8-rdminmax_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/x24-transposec-4x4-ssse3.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-sse2-u32.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52937,14 +67846,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x24-transposec_x64") {
++  source_set("u8-rdminmax_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.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" ]
@@ -52965,14 +67875,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x24-transposec_x64_standalone") {
++  source_set("u8-rdminmax_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.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" ]
@@ -52996,19 +67907,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_avx-no-avx2-no-f16c-no-fma") {
++  source_set("u8-rminmax_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x16s4-gemm-goi-avx-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-avx-u4.c"
++      "src/src/u8-rminmax/gen/u8-rmax-sse2-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-sse2-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-sse2-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53029,19 +67938,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("u8-rminmax_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x16s4-gemm-goi-avx-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-avx-u4.c"
++      "src/src/u8-rminmax/gen/u8-rmax-sse2-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-sse2-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-sse2-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53065,16 +67972,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_avx512f") {
++  source_set("u8-rminmax_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx512f-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-avx512f-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x32c2-gemm-goi-avx512f-u4-prfm.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" ]
@@ -53095,16 +68002,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_avx512f_standalone") {
++  source_set("u8-rminmax_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx512f-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-avx512f-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x32c2-gemm-goi-avx512f-u4-prfm.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" ]
@@ -53128,16 +68035,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_sse2-no-sse3") {
++  source_set("u8-vclamp_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x2c4-gemm-goi-sse2-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-sse2-u4.c"
++      "src/src/u8-vclamp/u8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53158,16 +68065,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_sse2-no-sse3_standalone") {
++  source_set("u8-vclamp_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x2c4-gemm-goi-sse2-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-sse2-u4.c"
++      "src/src/u8-vclamp/u8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53191,22 +68098,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_x64") {
++  source_set("u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/u8-vclamp/u8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53227,22 +68132,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_x64_standalone") {
++  source_set("u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/u8-vclamp/u8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53266,17 +68169,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_avx-no-avx2-no-f16c-no-fma") {
++  source_set("u8-vclamp_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-8x8-reuse-multi-avx.c"
++      "src/src/u8-vclamp/u8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53297,17 +68198,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("u8-vclamp_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-8x8-reuse-multi-avx.c"
++      "src/src/u8-vclamp/u8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53331,15 +68230,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_sse-no-sse2") {
++  source_set("u8-vclamp_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/x32-transposec-4x4-sse.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53360,15 +68258,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_sse-no-sse2_standalone") {
++  source_set("u8-vclamp_x64_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/x32-transposec-4x4-sse.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53392,14 +68289,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_x64") {
++  source_set("x16-packw_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "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" ]
@@ -53420,14 +68320,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_x64_standalone") {
++  source_set("x16-packw_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "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" ]
@@ -53451,15 +68354,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-unpool_sse2-no-sse3") {
++  source_set("x16-packw_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-sse2.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-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" ]
@@ -53480,15 +68385,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-unpool_sse2-no-sse3_standalone") {
++  source_set("x16-packw_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-sse2.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-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" ]
@@ -53512,14 +68419,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-unpool_x64") {
++  source_set("x16-transposec_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53540,14 +68449,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-unpool_x64_standalone") {
++  source_set("x16-transposec_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53571,17 +68482,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma") {
++  source_set("x16-transposec_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
++      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53602,17 +68511,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("x16-transposec_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
++      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53636,15 +68543,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_sse2-no-sse3") {
++  source_set("x16-transposec_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53665,15 +68571,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_sse2-no-sse3_standalone") {
++  source_set("x16-transposec_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53697,14 +68602,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_x64") {
++  source_set("x16-x32-packw_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53725,14 +68631,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_x64_standalone") {
++  source_set("x16-x32-packw_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53756,17 +68663,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_avx-no-avx2-no-f16c-no-fma") {
++  source_set("x24-transposec_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx-u64.c"
++      "src/src/x24-transposec/x24-transposec-4x4-ssse3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53787,17 +68692,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("x24-transposec_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx-u64.c"
++      "src/src/x24-transposec/x24-transposec-4x4-ssse3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53821,16 +68724,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_f16c-fma-avx2") {
++  source_set("x24-transposec_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx2-u128.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53851,16 +68752,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_f16c-fma-avx2_standalone") {
++  source_set("x24-transposec_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx2-u128.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53884,20 +68783,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("x32-packw_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c"
++      "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x16s4-gemm-goi-avx-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-avx-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53918,20 +68816,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("x32-packw_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c"
++      "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x16s4-gemm-goi-avx-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-avx-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53955,21 +68852,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi") {
++  source_set("x32-packw_avx512f") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vbmi",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
++      "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx512f-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-avx512f-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x32c2-gemm-goi-avx512f-u4-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53990,21 +68882,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi_standalone") {
++  source_set("x32-packw_avx512f_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vbmi",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
++      "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx512f-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-avx512f-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x32c2-gemm-goi-avx512f-u4-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54028,14 +68915,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_x64") {
++  source_set("x32-packw_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x32-packw/gen/x32-packw-x2c4-gemm-goi-sse2-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-sse2-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54056,14 +68945,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_x64_standalone") {
++  source_set("x32-packw_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x32-packw/gen/x32-packw-x2c4-gemm-goi-sse2-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-sse2-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54087,14 +68978,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-packq_x64") {
++  source_set("x32-packw_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54115,14 +69014,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packq_x64_standalone") {
++  source_set("x32-packw_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54146,21 +69053,80 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-packw_x64") {
++  source_set("x32-transposec_avx-no-avx2-no-f16c-no-fma") {
++    cflags = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-transposec/gen/x32-transposec-8x8-reuse-multi-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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x32-transposec_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-transposec/gen/x32-transposec-8x8-reuse-multi-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" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x32-transposec_sse-no-sse2") {
++    cflags = [
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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/x32-transposec/x32-transposec-4x4-sse.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54181,21 +69147,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packw_x64_standalone") {
++  source_set("x32-transposec_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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/x32-transposec/x32-transposec-4x4-sse.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54219,16 +69179,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_f16c-fma-avx2") {
++  source_set("x32-transposec_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54249,16 +69207,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_f16c-fma-avx2_standalone") {
++  source_set("x32-transposec_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54282,7 +69238,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_sse2-no-sse3") {
++  source_set("x32-unpool_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -54290,7 +69246,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c"
++      "src/src/x32-unpool/x32-unpool-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54311,7 +69267,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_sse2-no-sse3_standalone") {
++  source_set("x32-unpool_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -54319,7 +69275,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c"
++      "src/src/x32-unpool/x32-unpool-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54343,14 +69299,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_x64") {
++  source_set("x32-unpool_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54371,14 +69327,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_x64_standalone") {
++  source_set("x32-unpool_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54402,14 +69358,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-copy_x64") {
++  source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54430,14 +69389,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-copy_x64_standalone") {
++  source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54461,7 +69423,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-fill_sse2-no-sse3") {
++  source_set("x64-transposec_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -54469,7 +69431,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-sse2-u64.c"
++      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54490,7 +69452,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-fill_sse2-no-sse3_standalone") {
++  source_set("x64-transposec_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -54498,7 +69460,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-sse2-u64.c"
++      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54522,14 +69484,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-fill_x64") {
++  source_set("x64-transposec_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54550,85 +69512,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-fill_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "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:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("xx-pad_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("x64-transposec_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p64-avx512skx-u128.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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("xx-pad_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p64-avx512skx-u128.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54652,15 +69543,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-pad_sse2-no-sse3") {
++  source_set("x8-lut_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p16-sse2-u16.c"
++      "src/src/x8-lut/gen/x8-lut-avx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54681,15 +69574,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-pad_sse2-no-sse3_standalone") {
++  source_set("x8-lut_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p16-sse2-u16.c"
++      "src/src/x8-lut/gen/x8-lut-avx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54713,14 +69608,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-pad_x64") {
++  source_set("x8-lut_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++      "src/src/x8-lut/gen/x8-lut-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54741,14 +69638,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-pad_x64_standalone") {
++  source_set("x8-lut_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++      "src/src/x8-lut/gen/x8-lut-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54772,14 +69671,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-transposev_x64") {
++  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54800,14 +69705,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-transposev_x64_standalone") {
++  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54830,19 +69741,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  }
 +}
 +
-+}
-+
-+if (current_cpu == "arm64") {
 +if (build_with_chromium) {
-+  source_set("bf16-f32-vcvt_arm64") {
++  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vbmi",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-neon-u8.c",
-+    "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
++      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54863,15 +69777,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-f32-vcvt_arm64_standalone") {
++  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vbmi",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-neon-u8.c",
-+    "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
++      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54895,14 +69815,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("bf16-qs8-vcvt_arm64") {
++  source_set("x8-lut_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54923,14 +69843,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-qs8-vcvt_arm64_standalone") {
++  source_set("x8-lut_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54954,14 +69874,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("bf16-qu8-vcvt_arm64") {
++  source_set("x8-packq_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54982,14 +69902,14 @@ Index: chromium-152.0.7977.64/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_arm64_standalone") {
++  source_set("x8-packq_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55013,19 +69933,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("bf16-rminmax_arm64") {
++  source_set("x8-packw_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-rminmax/gen/bf16-rmax-neon-u32-acc4.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmin-neon-u32-acc4.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rminmax-neon-u32-acc4.c",
-+    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55046,19 +69968,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-rminmax_arm64_standalone") {
++  source_set("x8-packw_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-rminmax/gen/bf16-rmax-neon-u32-acc4.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmin-neon-u32-acc4.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rminmax-neon-u32-acc4.c",
-+    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55082,37 +70006,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("configs_arm64") {
++  source_set("x8-transposec_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-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/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55133,37 +70036,77 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("configs_arm64_standalone") {
++  source_set("x8-transposec_f16c-fma-avx2_standalone") {
 +    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-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("x8-transposec_sse2-no-sse3") {
++    cflags = [
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/x8-transposec/gen/x8-transposec-16x16-reuse-mov-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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x8-transposec_sse2-no-sse3_standalone") {
++    cflags = [
++      "-mno-sse3",
++    "-msse2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55187,18 +70130,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("enums_arm64") {
++  source_set("x8-transposec_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"
++      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55219,18 +70158,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("enums_arm64_standalone") {
++  source_set("x8-transposec_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"
++      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55254,14 +70189,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-avgpool_arch=armv8.2-a+fp16") {
++  source_set("xx-copy_x64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55282,14 +70217,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-avgpool_arch=armv8.2-a+fp16_standalone") {
++  source_set("xx-copy_x64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55313,14 +70248,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16") {
++  source_set("xx-fill_sse2-no-sse3") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
++      "src/src/xx-fill/xx-fill-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55341,14 +70277,15 @@ Index: chromium-152.0.7977.64/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("xx-fill_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
++      "src/src/xx-fill/xx-fill-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55372,17 +70309,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16") {
++  source_set("xx-fill_x64") {
 +    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/xx-fill/xx-fill-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55403,17 +70337,14 @@ Index: chromium-152.0.7977.64/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("xx-fill_x64_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/xx-fill/xx-fill-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55437,18 +70368,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-dwconv_arch=armv8.2-a+fp16") {
++  source_set("xx-pad_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/xx-pad/xx-pad-p64-avx512skx-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55469,18 +70402,20 @@ Index: chromium-152.0.7977.64/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("xx-pad_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/xx-pad/xx-pad-p64-avx512skx-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55504,16 +70439,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_arm64") {
++  source_set("xx-pad_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/xx-pad/xx-pad-p16-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55534,16 +70468,15 @@ Index: chromium-152.0.7977.64/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("xx-pad_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/xx-pad/xx-pad-p16-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55567,14 +70500,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16") {
++  source_set("xx-pad_x64") {
 +    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/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55595,14 +70528,14 @@ Index: chromium-152.0.7977.64/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("xx-pad_x64_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/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55626,14 +70559,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16") {
++  source_set("xx-transposev_x64") {
 +    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/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55654,14 +70587,14 @@ Index: chromium-152.0.7977.64/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("xx-transposev_x64_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/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55684,74 +70617,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  }
 +}
 +
-+if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-f32acc-rsum2_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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/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 (current_cpu == "arm64") {
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16") {
++  source_set("bf16-f32-vcvt_arm64") {
 +    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/bf16-f32-vcvt/gen/bf16-f32-vcvt-neon-u8.c",
++    "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55772,14 +70650,15 @@ Index: chromium-152.0.7977.64/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("bf16-f32-vcvt_arm64_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/bf16-f32-vcvt/gen/bf16-f32-vcvt-neon-u8.c",
++    "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55803,17 +70682,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-gemm_arch=armv8.2-a+fp16") {
++  source_set("bf16-qs8-vcvt_arm64") {
 +    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/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55834,17 +70710,14 @@ Index: chromium-152.0.7977.64/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("bf16-qs8-vcvt_arm64_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"
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55868,21 +70741,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("bf16-qu8-vcvt_arm64") {
 +    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/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55903,21 +70769,14 @@ Index: chromium-152.0.7977.64/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+dotprod_standalone") {
++  source_set("bf16-qu8-vcvt_arm64_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/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55941,14 +70800,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16") {
++  source_set("bf16-rminmax_arm64") {
 +    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/bf16-rminmax/gen/bf16-rmax-neon-u32-acc4.c",
++    "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-neon-u32-acc4.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-neon-u32-acc4.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55969,14 +70833,19 @@ Index: chromium-152.0.7977.64/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("bf16-rminmax_arm64_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/bf16-rminmax/gen/bf16-rmax-neon-u32-acc4.c",
++    "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-neon-u32-acc4.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-neon-u32-acc4.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56000,14 +70869,37 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-ibilinear_arch=armv8.2-a+fp16") {
++  source_set("configs_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
++      "src/src/configs/argmaxpool-config.c",
++    "src/src/configs/avgpool-config.c",
++    "src/src/configs/binary-elementwise-config.c",
++    "src/src/configs/cmul-config.c",
++    "src/src/configs/conv-hwc2chw-config.c",
++    "src/src/configs/dwconv-config.c",
++    "src/src/configs/dwconv2d-chw-config.c",
++    "src/src/configs/gemm-config.c",
++    "src/src/configs/hardware-config.c",
++    "src/src/configs/ibilinear-chw-config.c",
++    "src/src/configs/ibilinear-config.c",
++    "src/src/configs/lut32norm-config.c",
++    "src/src/configs/maxpool-config.c",
++    "src/src/configs/pack-lh-config.c",
++    "src/src/configs/raddstoreexpminusmax-config.c",
++    "src/src/configs/reduce-config.c",
++    "src/src/configs/spmm-config.c",
++    "src/src/configs/transpose-config.c",
++    "src/src/configs/unary-elementwise-config.c",
++    "src/src/configs/unpool-config.c",
++    "src/src/configs/vmulcaddc-config.c",
++    "src/src/configs/x8-lut-config.c",
++    "src/src/configs/xx-fill-config.c",
++    "src/src/configs/xx-pad-config.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56028,14 +70920,37 @@ Index: chromium-152.0.7977.64/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("configs_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
++      "src/src/configs/argmaxpool-config.c",
++    "src/src/configs/avgpool-config.c",
++    "src/src/configs/binary-elementwise-config.c",
++    "src/src/configs/cmul-config.c",
++    "src/src/configs/conv-hwc2chw-config.c",
++    "src/src/configs/dwconv-config.c",
++    "src/src/configs/dwconv2d-chw-config.c",
++    "src/src/configs/gemm-config.c",
++    "src/src/configs/hardware-config.c",
++    "src/src/configs/ibilinear-chw-config.c",
++    "src/src/configs/ibilinear-config.c",
++    "src/src/configs/lut32norm-config.c",
++    "src/src/configs/maxpool-config.c",
++    "src/src/configs/pack-lh-config.c",
++    "src/src/configs/raddstoreexpminusmax-config.c",
++    "src/src/configs/reduce-config.c",
++    "src/src/configs/spmm-config.c",
++    "src/src/configs/transpose-config.c",
++    "src/src/configs/unary-elementwise-config.c",
++    "src/src/configs/unpool-config.c",
++    "src/src/configs/vmulcaddc-config.c",
++    "src/src/configs/x8-lut-config.c",
++    "src/src/configs/xx-fill-config.c",
++    "src/src/configs/xx-pad-config.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56059,17 +70974,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16") {
++  source_set("enums_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    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/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" ]
@@ -56090,17 +71006,18 @@ Index: chromium-152.0.7977.64/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("enums_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    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/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" ]
@@ -56124,21 +71041,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-avgpool_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-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56159,21 +71069,14 @@ Index: chromium-152.0.7977.64/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-avgpool_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-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56197,14 +71100,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_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-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
++      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56225,14 +71128,14 @@ Index: chromium-152.0.7977.64/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-conv-hwc2chw_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-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56256,14 +71159,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_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-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.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" ]
@@ -56284,14 +71190,17 @@ Index: chromium-152.0.7977.64/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-dwconv2d-chw_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-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" ]
@@ -56315,14 +71224,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qs8-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-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-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" ]
@@ -56343,14 +71256,18 @@ Index: chromium-152.0.7977.64/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-dwconv_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-scalar-imagic-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" ]
@@ -56374,14 +71291,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_arm64") {
++  source_set("f16-f32-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-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" ]
@@ -56402,14 +71321,16 @@ Index: chromium-152.0.7977.64/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-f32-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-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" ]
@@ -56433,14 +71354,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56461,14 +71382,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  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-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56492,15 +71413,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_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-rdminmax/gen/f16-rdmax-2p2x-neonfp16arith-u32.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-neonfp16arith-u32.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56521,15 +71441,14 @@ Index: chromium-152.0.7977.64/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-f32acc-rdsum_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-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56553,15 +71472,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_arm64") {
++  source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56582,15 +71500,14 @@ Index: chromium-152.0.7977.64/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") {
++  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-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56614,16 +71531,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_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-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-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56644,16 +71559,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  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-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-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56677,16 +71590,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_arm64") {
++  source_set("f16-gemm_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -56707,16 +71621,17 @@ Index: chromium-152.0.7977.64/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-gemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -56740,14 +71655,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-spmm_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-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.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" ]
@@ -56768,14 +71690,21 @@ Index: chromium-152.0.7977.64/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-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-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.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" ]
@@ -56799,14 +71728,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_arch=armv8.2-a+fp16") {
++  source_set("f16-ibilinear-chw_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-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56827,14 +71756,14 @@ Index: chromium-152.0.7977.64/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-ibilinear-chw_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-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56858,15 +71787,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_arm64") {
++  source_set("f16-ibilinear_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56887,15 +71815,14 @@ Index: chromium-152.0.7977.64/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-ibilinear_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56919,35 +71846,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_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-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-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" ]
@@ -56968,35 +71877,17 @@ Index: chromium-152.0.7977.64/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-igemm_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-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" ]
@@ -57020,14 +71911,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vclamp_arch=armv8.2-a+fp16") {
++  source_set("f16-igemm_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-vclamp/gen/f16-vclamp-neonfp16arith-u16.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" ]
@@ -57048,14 +71946,21 @@ Index: chromium-152.0.7977.64/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-igemm_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-vclamp/gen/f16-vclamp-neonfp16arith-u16.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" ]
@@ -57079,14 +71984,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcmul_arch=armv8.2-a+fp16") {
++  source_set("f16-maxpool_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-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57107,14 +72012,14 @@ Index: chromium-152.0.7977.64/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-maxpool_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-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57138,14 +72043,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcos_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-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57166,14 +72071,14 @@ Index: chromium-152.0.7977.64/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-qs8-vcvt_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-rational-3-2-div.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57197,14 +72102,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcos_arm64") {
++  source_set("f16-qs8-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57225,14 +72130,14 @@ Index: chromium-152.0.7977.64/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-qs8-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57256,14 +72161,73 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-velu_arch=armv8.2-a+fp16") {
++  source_set("f16-qu8-vcvt_arm64") {
++    cflags = [
++  
++    ]
++  
++    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" ]
++
++    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-qu8-vcvt_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/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=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-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57284,14 +72248,14 @@ Index: chromium-152.0.7977.64/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-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57315,14 +72279,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vexp_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-vexp/gen/f16-vexp-neonfp16arith-poly-3.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" ]
@@ -57343,14 +72308,15 @@ Index: chromium-152.0.7977.64/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-rdminmax_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-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" ]
@@ -57374,15 +72340,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vexp_arm64") {
++  source_set("f16-rdminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-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" ]
@@ -57403,15 +72369,15 @@ Index: chromium-152.0.7977.64/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-rdminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-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" ]
@@ -57435,14 +72401,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_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-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.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" ]
@@ -57463,14 +72431,16 @@ Index: chromium-152.0.7977.64/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-rminmax_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-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" ]
@@ -57494,14 +72464,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_arm64") {
++  source_set("f16-rminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57522,14 +72494,16 @@ Index: chromium-152.0.7977.64/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-rminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57553,14 +72527,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vhswish_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-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
++      "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57581,14 +72555,14 @@ Index: chromium-152.0.7977.64/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-spmm_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-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57612,14 +72586,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vlog_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-vlog/gen/f16-vlog-neonfp16arith-rational-1-3-div.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57640,14 +72614,14 @@ Index: chromium-152.0.7977.64/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-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57671,15 +72645,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vlog_arm64") {
++  source_set("f16-vapproxgelu_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-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" ]
@@ -57700,15 +72674,116 @@ Index: chromium-152.0.7977.64/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-vapproxgelu_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-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" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/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=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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//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-vbinary_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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57732,14 +72807,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vlrelu_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-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57760,14 +72835,14 @@ Index: chromium-152.0.7977.64/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-vclamp_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-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57791,14 +72866,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vmulcaddc_arch=armv8.2-a+fp16") {
++  source_set("f16-vcmul_arch=armv8.2-a+fp16") {
 +    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-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57819,14 +72894,14 @@ Index: chromium-152.0.7977.64/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-vcmul_arch=armv8.2-a+fp16_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-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57850,17 +72925,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vrnd_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-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-vcos/gen/f16-vcos-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57881,17 +72953,14 @@ Index: chromium-152.0.7977.64/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-vcos_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-vcos/gen/f16-vcos-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57915,14 +72984,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vrsqrt_arch=armv8.2-a+fp16") {
++  source_set("f16-vcos_arm64") {
 +    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-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" ]
@@ -57943,14 +73013,15 @@ Index: chromium-152.0.7977.64/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-vcos_arm64_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-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" ]
@@ -57974,15 +73045,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsigmoid_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-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-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58003,15 +73073,14 @@ Index: chromium-152.0.7977.64/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-velu_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-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58035,14 +73104,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsin_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-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58063,14 +73132,14 @@ Index: chromium-152.0.7977.64/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-vexp_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-rational-3-2-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58094,14 +73163,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsin_arm64") {
++  source_set("f16-vexp_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-neonfp16-poly-3.c",
++    "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58122,14 +73192,15 @@ Index: chromium-152.0.7977.64/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-vexp_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-neonfp16-poly-3.c",
++    "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58153,15 +73224,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_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-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c",
-+    "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58182,15 +73252,14 @@ Index: chromium-152.0.7977.64/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-vgelu_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-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58214,14 +73283,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_arm64") {
++  source_set("f16-vgelu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58242,14 +73311,14 @@ Index: chromium-152.0.7977.64/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-vgelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58273,14 +73342,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_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-vtanh/gen/f16-vtanh-neonfp16arith-rational-5-4-div.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58301,14 +73370,14 @@ Index: chromium-152.0.7977.64/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-vhswish_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-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58332,15 +73401,74 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_arm64") {
++  source_set("f16-vlog_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//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_arch=armv8.2-a+fp16_standalone") {
++    cflags = [
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vlog/gen/f16-vlog-neonfp16arith-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-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" ]
@@ -58361,15 +73489,15 @@ Index: chromium-152.0.7977.64/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-vlog_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-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" ]
@@ -58393,16 +73521,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vunary_arch=armv8.2-a+fp16") {
++  source_set("f16-vlrelu_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-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58423,16 +73549,14 @@ Index: chromium-152.0.7977.64/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-vlrelu_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-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58456,15 +73580,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_arm64") {
++  source_set("f16-vmulcaddc_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58485,15 +73608,14 @@ Index: chromium-152.0.7977.64/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-vmulcaddc_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58517,15 +73639,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_arm64") {
++  source_set("f16-vrnd_arch=armv8.2-a+fp16") {
 +    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-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" ]
@@ -58546,15 +73670,76 @@ Index: chromium-152.0.7977.64/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-vrnd_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/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=armv8.2-a+fp16") {
++    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-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    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=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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58578,14 +73763,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16") {
++  source_set("f16-vsigmoid_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-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" ]
@@ -58606,14 +73792,15 @@ Index: chromium-152.0.7977.64/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-vsigmoid_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-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" ]
@@ -58637,15 +73824,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_arm64") {
++  source_set("f16-vsin_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vsin/gen/f16-vsin-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58666,15 +73852,14 @@ Index: chromium-152.0.7977.64/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("f16-vsin_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vsin/gen/f16-vsin-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58698,16 +73883,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_arm64") {
++  source_set("f16-vsin_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/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" ]
@@ -58728,16 +73912,15 @@ Index: chromium-152.0.7977.64/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("f16-vsin_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/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" ]
@@ -58761,29 +73944,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_arm64") {
++  source_set("f16-vsqrt_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -58804,29 +73973,15 @@ Index: chromium-152.0.7977.64/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("f16-vsqrt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -58850,16 +74005,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-vsqrt_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/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58880,16 +74033,14 @@ Index: chromium-152.0.7977.64/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("f16-vsqrt_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/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58913,31 +74064,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_arm64") {
++  source_set("f16-vtanh_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-25p8c-minmax-neon.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-neonfma-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-3p8c-minmax-neon.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-neonfma.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-4p8c-minmax-neon.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-neonfma.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-dwconv/gen/f32-dwconv-9p8c-minmax-neon.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-neonfma.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58958,31 +74092,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_arm64_standalone") {
++  source_set("f16-vtanh_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-25p8c-minmax-neon.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-neonfma-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-3p8c-minmax-neon.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-neonfma.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-4p8c-minmax-neon.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-neonfma.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-dwconv/gen/f32-dwconv-9p8c-minmax-neon.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-neonfma.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59006,16 +74123,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_arm64") {
++  source_set("f16-vtanh_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neon-u8.c",
-+    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neonfp16-u16.c",
-+    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.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" ]
@@ -59036,16 +74152,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_arm64_standalone") {
++  source_set("f16-vtanh_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neon-u8.c",
-+    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neonfp16-u16.c",
-+    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.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" ]
@@ -59069,36 +74184,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-vunary_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/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-2.S",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-asm-aarch64-neonfma-ld128.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-ld128-2.S",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-ld128.S",
-+    "src/src/f32-gemm/gen/f32-gemm-7x8-minmax-asm-aarch64-neonfma-ld128-2.S",
-+    "src/src/f32-gemm/gen/f32-gemm-8x8-minmax-asm-aarch64-neonfma-ld128-2.S"
++      "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" ]
@@ -59119,36 +74214,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("f16-vunary_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/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-2.S",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-asm-aarch64-neonfma-ld128.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-ld128-2.S",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-ld128.S",
-+    "src/src/f32-gemm/gen/f32-gemm-7x8-minmax-asm-aarch64-neonfma-ld128-2.S",
-+    "src/src/f32-gemm/gen/f32-gemm-8x8-minmax-asm-aarch64-neonfma-ld128-2.S"
++      "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" ]
@@ -59172,30 +74247,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-gemm_arm64") {
++  source_set("f32-argmaxpool_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-aarch64-neonfma-lane-ld128.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-1x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8s4-minmax-neonfma.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x16-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-aarch64-neonfma-lane-ld64.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-neon-lane-ld64.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-gemm/gen/f32-gemm-4x8-minmax-neon-lane-ld128.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8s4-minmax-neonfma.c",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8s4-minmax-neonfma.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" ]
@@ -59216,30 +74276,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_arm64_standalone") {
++  source_set("f32-argmaxpool_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-aarch64-neonfma-lane-ld128.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-1x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x8s4-minmax-neonfma.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x16-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-aarch64-neonfma-lane-ld64.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-neon-lane-ld64.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-gemm/gen/f32-gemm-4x8-minmax-neon-lane-ld128.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x8s4-minmax-neonfma.c",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-gemm/gen/f32-gemm-6x8s4-minmax-neonfma.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" ]
@@ -59263,16 +74308,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_arm64") {
++  source_set("f32-avgpool_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neon-p8.c",
-+    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neonfma-p8.c",
-+    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.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" ]
@@ -59293,16 +74337,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear-chw_arm64_standalone") {
++  source_set("f32-avgpool_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neon-p8.c",
-+    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neonfma-p8.c",
-+    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.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" ]
@@ -59326,16 +74369,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_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-ibilinear/gen/f32-ibilinear-neon-u8.c",
-+    "src/src/f32-ibilinear/gen/f32-ibilinear-neonfma-u8.c",
-+    "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59356,16 +74397,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear_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-ibilinear/gen/f32-ibilinear-neon-u8.c",
-+    "src/src/f32-ibilinear/gen/f32-ibilinear-neonfma-u8.c",
-+    "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59389,33 +74428,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-igemm_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-igemm/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
-+    "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
-+    "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-ld64.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-ld128.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-ld128.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" ]
@@ -59436,33 +74457,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_arch=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-igemm/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
-+    "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
-+    "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-ld64.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-ld128.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-ld128.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" ]
@@ -59486,30 +74489,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-igemm_arm64") {
++  source_set("f32-conv-hwc2chw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-aarch64-neonfma-lane-ld128.c",
-+    "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-1x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8s4-minmax-neonfma.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x16-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-aarch64-neonfma-lane-ld64.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-neon-lane-ld64.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-igemm/gen/f32-igemm-4x8-minmax-neon-lane-ld128.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8s4-minmax-neonfma.c",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8s4-minmax-neonfma.c"
++      "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" ]
@@ -59530,30 +74519,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_arm64_standalone") {
++  source_set("f32-conv-hwc2chw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-aarch64-neonfma-lane-ld128.c",
-+    "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-1x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x8s4-minmax-neonfma.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x16-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-aarch64-neonfma-lane-ld64.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-neon-lane-ld64.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-igemm/gen/f32-igemm-4x8-minmax-neon-lane-ld128.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x8s4-minmax-neonfma.c",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-igemm/gen/f32-igemm-6x8s4-minmax-neonfma.c"
++      "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" ]
@@ -59577,15 +74552,29 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_arm64") {
++  source_set("f32-dwconv2d-chw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-neon-u4.c",
-+    "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "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" ]
@@ -59606,15 +74595,29 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_arm64_standalone") {
++  source_set("f32-dwconv2d-chw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-neon-u4.c",
-+    "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "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" ]
@@ -59638,20 +74641,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_arm64") {
++  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-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c"
++      "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59672,20 +74671,16 @@ Index: chromium-152.0.7977.64/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_arm64_standalone") {
++  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-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-aarch64-neonfma-lane-ld128.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c"
++      "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59709,18 +74704,31 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f32-dwconv_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128.S",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-asm-aarch64-neonfma-ld128.S"
++      "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-25p8c-minmax-neon.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-neonfma-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-3p8c-minmax-neon.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-neonfma.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-4p8c-minmax-neon.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-neonfma.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-dwconv/gen/f32-dwconv-9p8c-minmax-neon.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-neonfma.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59741,18 +74749,31 @@ Index: chromium-152.0.7977.64/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_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("f32-dwconv_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128.S",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-asm-aarch64-neonfma-ld128.S"
++      "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-25p8c-minmax-neon.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-neonfma-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-3p8c-minmax-neon.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-neonfma.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-4p8c-minmax-neon.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-neonfma.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-dwconv/gen/f32-dwconv-9p8c-minmax-neon.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-neonfma.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59776,19 +74797,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_arm64") {
++  source_set("f32-f16-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-1x8-minmax-aarch64-neonfma-lane-ld64.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-aarch64-neonfma-lane-ld64.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neon-u8.c",
++    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neonfp16-u16.c",
++    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59809,19 +74827,16 @@ Index: chromium-152.0.7977.64/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_arm64_standalone") {
++  source_set("f32-f16-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-1x8-minmax-aarch64-neonfma-lane-ld64.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x8-minmax-neon-lane-ld64.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-aarch64-neonfma-lane-ld64.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neon-u8.c",
++    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neonfp16-u16.c",
++    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59845,17 +74860,36 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_arm64") {
++  source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-neon-u32.c",
-+    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-neonv8-u32.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"
++      "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-2.S",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-asm-aarch64-neonfma-ld128.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-ld128-2.S",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-ld128.S",
++    "src/src/f32-gemm/gen/f32-gemm-7x8-minmax-asm-aarch64-neonfma-ld128-2.S",
++    "src/src/f32-gemm/gen/f32-gemm-8x8-minmax-asm-aarch64-neonfma-ld128-2.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59876,17 +74910,36 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_arm64_standalone") {
++  source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-neon-u32.c",
-+    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-neonv8-u32.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"
++      "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-2.S",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-asm-aarch64-neonfma-ld128.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
++    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-asm-aarch64-neonfma-ld128-2.S",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-asm-aarch64-neonfma-ld128.S",
++    "src/src/f32-gemm/gen/f32-gemm-7x8-minmax-asm-aarch64-neonfma-ld128-2.S",
++    "src/src/f32-gemm/gen/f32-gemm-8x8-minmax-asm-aarch64-neonfma-ld128-2.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59910,17 +74963,30 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_arm64") {
++  source_set("f32-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-neon-u32.c",
-+    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-neonv8-u32.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"
++      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-aarch64-neonfma-lane-ld128.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-1x8-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-neon-lane-ld64.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x8s4-minmax-neonfma.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x16-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-aarch64-neonfma-lane-ld64.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-neon-lane-ld64.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-gemm/gen/f32-gemm-4x8-minmax-neon-lane-ld128.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x8s4-minmax-neonfma.c",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-gemm/gen/f32-gemm-6x8s4-minmax-neonfma.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59941,17 +75007,30 @@ Index: chromium-152.0.7977.64/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_arm64_standalone") {
++  source_set("f32-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-neon-u32.c",
-+    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-neonv8-u32.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"
++      "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-aarch64-neonfma-lane-ld128.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-1x8-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-neon-lane-ld64.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x8s4-minmax-neonfma.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x16-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-aarch64-neonfma-lane-ld64.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-neon-lane-ld64.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-gemm/gen/f32-gemm-4x8-minmax-neon-lane-ld128.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x8s4-minmax-neonfma.c",
++    "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-gemm/gen/f32-gemm-6x8s4-minmax-neonfma.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59975,15 +75054,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_arm64") {
++  source_set("f32-ibilinear-chw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-neonfma-rr1-lut64-p2-u16-acc2.c",
-+    "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neon-p8.c",
++    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neonfma-p8.c",
++    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60004,15 +75084,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_arm64_standalone") {
++  source_set("f32-ibilinear-chw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-neonfma-rr1-lut64-p2-u16-acc2.c",
-+    "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neon-p8.c",
++    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neonfma-p8.c",
++    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60036,17 +75117,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_arm64") {
++  source_set("f32-ibilinear_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-neon-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-neon-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-neon-u8.c",
++    "src/src/f32-ibilinear/gen/f32-ibilinear-neonfma-u8.c",
++    "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60067,17 +75147,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_arm64_standalone") {
++  source_set("f32-ibilinear_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-neon-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-neon-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-neon-u8.c",
++    "src/src/f32-ibilinear/gen/f32-ibilinear-neonfma-u8.c",
++    "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60101,15 +75180,33 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_arm64") {
++  source_set("f32-igemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-neon.c",
-+    "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-igemm/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
++    "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
++    "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-ld64.S",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-ld128.S",
++    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
++    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60130,15 +75227,33 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_arm64_standalone") {
++  source_set("f32-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-neon.c",
-+    "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-igemm/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
++    "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
++    "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-ld64.S",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
++    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-ld128.S",
++    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
++    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
++    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60162,15 +75277,30 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_arm64") {
++  source_set("f32-igemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-neon-u16.c",
-+    "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-aarch64-neonfma-lane-ld128.c",
++    "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-1x8-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-neon-lane-ld64.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x8s4-minmax-neonfma.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x16-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-aarch64-neonfma-lane-ld64.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-neon-lane-ld64.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-igemm/gen/f32-igemm-4x8-minmax-neon-lane-ld128.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x8s4-minmax-neonfma.c",
++    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-igemm/gen/f32-igemm-6x8s4-minmax-neonfma.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60191,15 +75321,30 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_arm64_standalone") {
++  source_set("f32-igemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-neon-u16.c",
-+    "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-aarch64-neonfma-lane-ld128.c",
++    "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-1x8-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-neon-lane-ld64.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x8s4-minmax-neonfma.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x16-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-aarch64-neonfma-lane-ld64.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-neon-lane-ld64.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-igemm/gen/f32-igemm-4x8-minmax-neon-lane-ld128.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x8s4-minmax-neonfma.c",
++    "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-igemm/gen/f32-igemm-6x8s4-minmax-neonfma.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60223,19 +75368,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_arm64") {
++  source_set("f32-maxpool_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-neon-u16-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-neon-u16-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-neon-u16-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-neon-u4.c",
++    "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60256,19 +75397,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_arm64_standalone") {
++  source_set("f32-maxpool_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-neon-u16-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-neon-u16-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-neon-u16-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-neon-u4.c",
++    "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60292,15 +75429,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_arm64") {
++  source_set("f32-qc4w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-neon.c",
-+    "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-neon-lane-ld64.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-neon-lane-ld64.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60321,15 +75463,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_arm64_standalone") {
++  source_set("f32-qc4w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-neon.c",
-+    "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-neon-lane-ld64.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-aarch64-neonfma-lane-ld128.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-neon-lane-ld64.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60353,15 +75500,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rsum_arm64") {
++  source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-neon-u16-acc4.c",
-+    "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128.S",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-asm-aarch64-neonfma-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60382,15 +75532,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_arm64_standalone") {
++  source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-neon-u16-acc4.c",
-+    "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128.S",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-asm-aarch64-neonfma-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60414,20 +75567,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-spmm_arm64") {
++  source_set("f32-qc8w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c",
-+    "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c",
-+    "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c",
-+    "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
++      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-aarch64-neonfma-lane-ld64.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-neon-lane-ld64.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x8-minmax-neon-lane-ld64.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-aarch64-neonfma-lane-ld64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60448,20 +75600,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_arm64_standalone") {
++  source_set("f32-qc8w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c",
-+    "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c",
-+    "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c",
-+    "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
++      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-aarch64-neonfma-lane-ld64.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-neon-lane-ld64.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x8-minmax-neon-lane-ld64.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8-minmax-aarch64-neonfma-lane-ld64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60485,15 +75636,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_arm64") {
++  source_set("f32-qs8-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-neon-rational-12-10-div.c",
-+    "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-neon-u32.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-neonv8-u32.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60514,15 +75667,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_arm64_standalone") {
++  source_set("f32-qs8-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-neon-rational-12-10-div.c",
-+    "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-neon-u32.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-neonv8-u32.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60546,51 +75701,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_arm64") {
++  source_set("f32-qu8-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-aarch64-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-aarch64-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-aarch64-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-neon-u32.c",
++    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-neonv8-u32.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60611,51 +75732,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_arm64_standalone") {
++  source_set("f32-qu8-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-aarch64-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-aarch64-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-aarch64-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-neon-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-neon-u32.c",
++    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-neonv8-u32.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60679,15 +75766,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_arm64") {
++  source_set("f32-raddstoreexpminusmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-neon.c",
-+    "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-neonfma-rr1-lut64-p2-u16-acc2.c",
++    "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60708,15 +75795,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_arm64_standalone") {
++  source_set("f32-raddstoreexpminusmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-neon.c",
-+    "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-neonfma-rr1-lut64-p2-u16-acc2.c",
++    "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60740,15 +75827,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_arm64") {
++  source_set("f32-rdminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-neon-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-neon-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60769,15 +75858,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_arm64_standalone") {
++  source_set("f32-rdminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-neon-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-neon-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60801,19 +75892,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_arm64") {
++  source_set("f32-rdsum2_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-neon.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-neon.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-neon.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-neon.c",
++    "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60834,19 +75921,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_arm64_standalone") {
++  source_set("f32-rdsum2_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-neon.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-neon.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-neon.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-neon.c",
++    "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60870,15 +75953,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vcos_arm64") {
++  source_set("f32-rdsum_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-neon-u16.c",
++    "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60899,15 +75982,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcos_arm64_standalone") {
++  source_set("f32-rdsum_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-neon-u16.c",
++    "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60931,17 +76014,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-velu_arm64") {
++  source_set("f32-rminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-neon-rr2-lut16-p3-u8.c",
-+    "src/src/f32-velu/gen/f32-velu-neonfma-rr1-lut16-p3-u16.c",
-+    "src/src/f32-velu/gen/f32-velu-neonfma-rr1-p6-u8.c",
-+    "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-rminmax/gen/f32-rmax-neon-u16-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-neon-u16-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-neon-u16-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60962,17 +76047,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_arm64_standalone") {
++  source_set("f32-rminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-neon-rr2-lut16-p3-u8.c",
-+    "src/src/f32-velu/gen/f32-velu-neonfma-rr1-lut16-p3-u16.c",
-+    "src/src/f32-velu/gen/f32-velu-neonfma-rr1-p6-u8.c",
-+    "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-rminmax/gen/f32-rmax-neon-u16-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-neon-u16-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-neon-u16-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60996,15 +76083,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vexp_arm64") {
++  source_set("f32-rsum2_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "src/src/f32-rsum2/gen/f32-rsum2-neon.c",
++    "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61025,15 +76112,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vexp_arm64_standalone") {
++  source_set("f32-rsum2_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "src/src/f32-rsum2/gen/f32-rsum2-neon.c",
++    "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61057,15 +76144,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_arm64") {
++  source_set("f32-rsum_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-neon-rational-12-10-div.c",
-+    "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-neon-u16-acc4.c",
++    "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61086,15 +76173,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_arm64_standalone") {
++  source_set("f32-rsum_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-neon-rational-12-10-div.c",
-+    "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-neon-u16-acc4.c",
++    "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61118,15 +76205,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_arm64") {
++  source_set("f32-spmm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-neon.c",
-+    "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c",
++    "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c",
++    "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c",
++    "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61147,15 +76239,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_arm64_standalone") {
++  source_set("f32-spmm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-neon.c",
-+    "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c",
++    "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c",
++    "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c",
++    "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61179,15 +76276,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlog_arm64") {
++  source_set("f32-vapproxgelu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-neon-rational-3-3-div.c",
-+    "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61208,15 +76305,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_arm64_standalone") {
++  source_set("f32-vapproxgelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-neon-rational-3-3-div.c",
-+    "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61240,15 +76337,51 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_arm64") {
++  source_set("f32-vbinary_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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"
++      "src/src/f32-vbinary/gen/f32-vadd-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-aarch64-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-aarch64-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vmax-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-aarch64-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61269,15 +76402,51 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_arm64_standalone") {
++  source_set("f32-vbinary_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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"
++      "src/src/f32-vbinary/gen/f32-vadd-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-aarch64-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-aarch64-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vmax-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-aarch64-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-neon-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61301,16 +76470,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_arm64") {
++  source_set("f32-vclamp_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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"
++      "src/src/f32-vclamp/gen/f32-vclamp-neon.c",
++    "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61331,16 +76499,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vmulcaddc_arm64_standalone") {
++  source_set("f32-vclamp_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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"
++      "src/src/f32-vclamp/gen/f32-vclamp-neon.c",
++    "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61364,25 +76531,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_arm64") {
++  source_set("f32-vcmul_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-neon-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndd-neonv8-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-neon-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-neonv8-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-neon-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-neonv8-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-neon-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-neonv8-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c"
++      "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" ]
@@ -61403,25 +76560,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_arm64_standalone") {
++  source_set("f32-vcmul_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-neon-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndd-neonv8-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-neon-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-neonv8-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-neon-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-neonv8-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-neon-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-neonv8-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c"
++      "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" ]
@@ -61445,16 +76592,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_arm64") {
++  source_set("f32-vcopysign_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-neon-rsqrt.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-neon.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-neon.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-neon.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61475,16 +76625,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_arm64_standalone") {
++  source_set("f32-vcopysign_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-neon-rsqrt.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-neon.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-neon.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-neon.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61508,16 +76661,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_arm64") {
++  source_set("f32-vcos_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-neon-rr2-lut64-p2-nr2recps-u8.c",
-+    "src/src/f32-vsigmoid/gen/f32-vsigmoid-neonfma-rr1-lut64-p2-nr2recps-u16.c",
-+    "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61538,16 +76690,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_arm64_standalone") {
++  source_set("f32-vcos_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-neon-rr2-lut64-p2-nr2recps-u8.c",
-+    "src/src/f32-vsigmoid/gen/f32-vsigmoid-neonfma-rr1-lut64-p2-nr2recps-u16.c",
-+    "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61571,15 +76722,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_arm64") {
++  source_set("f32-velu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-neon-rational-5-4-div.c",
-+    "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-velu/gen/f32-velu-neon-rr2-lut16-p3-u8.c",
++    "src/src/f32-velu/gen/f32-velu-neonfma-rr1-lut16-p3-u16.c",
++    "src/src/f32-velu/gen/f32-velu-neonfma-rr1-p6-u8.c",
++    "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61600,15 +76753,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_arm64_standalone") {
++  source_set("f32-velu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-neon-rational-5-4-div.c",
-+    "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-velu/gen/f32-velu-neon-rr2-lut16-p3-u8.c",
++    "src/src/f32-velu/gen/f32-velu-neonfma-rr1-lut16-p3-u16.c",
++    "src/src/f32-velu/gen/f32-velu-neonfma-rr1-p6-u8.c",
++    "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61632,15 +76787,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_arm64") {
++  source_set("f32-vexp_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-aarch64-neon-sqrt.c",
-+    "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61661,15 +76816,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_arm64_standalone") {
++  source_set("f32-vexp_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-aarch64-neon-sqrt.c",
-+    "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61693,15 +76848,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_arm64") {
++  source_set("f32-vgelu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-neon-rational-9-8-div.c",
-+    "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-neon-rational-12-10-div.c",
++    "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61722,15 +76877,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_arm64_standalone") {
++  source_set("f32-vgelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-neon-rational-9-8-div.c",
-+    "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-neon-rational-12-10-div.c",
++    "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61754,19 +76909,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vunary_arm64") {
++  source_set("f32-vhswish_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-neon.c",
-+    "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-neon.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-neon.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-neon.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61787,19 +76938,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_arm64_standalone") {
++  source_set("f32-vhswish_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-neon.c",
-+    "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-neon.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-neon.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-neon.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61823,36 +76970,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("operators_arm64") {
++  source_set("f32-vlog_arm64") {
 +    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"
++      "src/src/f32-vlog/gen/f32-vlog-neon-rational-3-3-div.c",
++    "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61873,36 +76999,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("operators_arm64_standalone") {
++  source_set("f32-vlog_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/operators/argmax-pooling-nhwc.c",
-+    "src/src/operators/average-pooling-nhwc.c",
-+    "src/src/operators/batch-matrix-multiply-nc.c",
-+    "src/src/operators/binary-elementwise-nd.c",
-+    "src/src/operators/constant-pad-nd.c",
-+    "src/src/operators/convolution-nchw.c",
-+    "src/src/operators/convolution-nhwc.c",
-+    "src/src/operators/deconvolution-nhwc.c",
-+    "src/src/operators/dynamic-fully-connected-nc.c",
-+    "src/src/operators/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/f32-vlog/gen/f32-vlog-neon-rational-3-3-div.c",
++    "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61926,15 +77031,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-vlrelu_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme.c",
-+    "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme2.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-neon-u8.c",
++    "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61955,15 +77060,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("f32-vlrelu_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme.c",
-+    "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme2.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-neon-u8.c",
++    "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61987,17 +77092,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-vmulcaddc_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme.c",
-+    "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme2.c",
-+    "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme.c",
-+    "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme2.c"
++      "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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62018,17 +77122,97 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("pf16-gemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("f32-vmulcaddc_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme.c",
-+    "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme2.c",
-+    "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme.c",
-+    "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme2.c"
++      "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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/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-vrnd_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vrnd/gen/f32-vrndd-neon-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndd-neonv8-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-neon-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-neonv8-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-neon-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-neonv8-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndz-neon-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndz-neonv8-u8.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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vrnd_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vrnd/gen/f32-vrndd-neon-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndd-neonv8-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-neon-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-neonv8-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-neon-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-neonv8-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndz-neon-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndz-neonv8-u8.c",
++    "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62052,17 +77236,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf32-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-vrsqrt_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c",
-+    "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c",
-+    "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c",
-+    "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-neon-rsqrt.c",
++    "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" ]
@@ -62083,17 +77266,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("pf32-gemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("f32-vrsqrt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c",
-+    "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c",
-+    "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c",
-+    "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-neon-rsqrt.c",
++    "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" ]
@@ -62117,15 +77299,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf32-igemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-vsigmoid_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme.c",
-+    "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme2.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-neon-rr2-lut64-p2-nr2recps-u8.c",
++    "src/src/f32-vsigmoid/gen/f32-vsigmoid-neonfma-rr1-lut64-p2-nr2recps-u16.c",
++    "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62146,15 +77329,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("pf32-igemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("f32-vsigmoid_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme.c",
-+    "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme2.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-neon-rr2-lut64-p2-nr2recps-u8.c",
++    "src/src/f32-vsigmoid/gen/f32-vsigmoid-neonfma-rr1-lut64-p2-nr2recps-u16.c",
++    "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62178,15 +77362,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-vsin_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme.c",
-+    "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme2.c"
++      "src/src/f32-vsin/gen/f32-vsin-neon-rational-5-4-div.c",
++    "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62207,15 +77391,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("f32-vsin_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme.c",
-+    "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme2.c"
++      "src/src/f32-vsin/gen/f32-vsin-neon-rational-5-4-div.c",
++    "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62239,16 +77423,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-vsqrt_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-1x32c4-minmax-neonsme2.c",
-+    "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme.c",
-+    "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme2.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-aarch64-neon-sqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62269,16 +77452,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("f32-vsqrt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-1x32c4-minmax-neonsme2.c",
-+    "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme.c",
-+    "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme2.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-aarch64-neon-sqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62302,15 +77484,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qb4-packw_arch=armv8.2-a+dotprod") {
++  source_set("f32-vtanh_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c",
-+    "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-neon-rational-9-8-div.c",
++    "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62331,15 +77513,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qb4-packw_arch=armv8.2-a+dotprod_standalone") {
++  source_set("f32-vtanh_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c",
-+    "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-neon-rational-9-8-div.c",
++    "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62363,15 +77545,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-bf16-qb4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("f32-vunary_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x16c4-minmax-neondot.c",
-+    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-4x16c4-minmax-neondot.c"
++      "src/src/f32-vunary/gen/f32-vabs-neon.c",
++    "src/src/f32-vunary/gen/f32-vabs-scalar.c",
++    "src/src/f32-vunary/gen/f32-vneg-neon.c",
++    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
++    "src/src/f32-vunary/gen/f32-vsqr-neon.c",
++    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62392,15 +77578,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-bf16-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("f32-vunary_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x16c4-minmax-neondot.c",
-+    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-4x16c4-minmax-neondot.c"
++      "src/src/f32-vunary/gen/f32-vabs-neon.c",
++    "src/src/f32-vunary/gen/f32-vabs-scalar.c",
++    "src/src/f32-vunary/gen/f32-vneg-neon.c",
++    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
++    "src/src/f32-vunary/gen/f32-vsqr-neon.c",
++    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62424,15 +77614,36 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-bf16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16+bf16") {
++  source_set("operators_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16+bf16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x16c8-minmax-neoni8mmbf16.c",
-+    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-4x16c8-minmax-neoni8mmbf16.c"
++      "src/src/operators/argmax-pooling-nhwc.c",
++    "src/src/operators/average-pooling-nhwc.c",
++    "src/src/operators/batch-matrix-multiply-nc.c",
++    "src/src/operators/binary-elementwise-nd.c",
++    "src/src/operators/constant-pad-nd.c",
++    "src/src/operators/convolution-nchw.c",
++    "src/src/operators/convolution-nhwc.c",
++    "src/src/operators/deconvolution-nhwc.c",
++    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
++    "src/src/operators/fully-connected-nc.c",
++    "src/src/operators/max-pooling-nhwc.c",
++    "src/src/operators/pack-lh.c",
++    "src/src/operators/reduce-nd.c",
++    "src/src/operators/resize-bilinear-nchw.c",
++    "src/src/operators/resize-bilinear-nhwc.c",
++    "src/src/operators/rope-nthc.c",
++    "src/src/operators/slice-nd.c",
++    "src/src/operators/softmax-nc.c",
++    "src/src/operators/transpose-nd.c",
++    "src/src/operators/unary-elementwise-nc.c",
++    "src/src/operators/unpooling-nhwc.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62453,15 +77664,36 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-bf16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16+bf16_standalone") {
++  source_set("operators_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16+bf16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x16c8-minmax-neoni8mmbf16.c",
-+    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-4x16c8-minmax-neoni8mmbf16.c"
++      "src/src/operators/argmax-pooling-nhwc.c",
++    "src/src/operators/average-pooling-nhwc.c",
++    "src/src/operators/batch-matrix-multiply-nc.c",
++    "src/src/operators/binary-elementwise-nd.c",
++    "src/src/operators/constant-pad-nd.c",
++    "src/src/operators/convolution-nchw.c",
++    "src/src/operators/convolution-nhwc.c",
++    "src/src/operators/deconvolution-nhwc.c",
++    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
++    "src/src/operators/fully-connected-nc.c",
++    "src/src/operators/max-pooling-nhwc.c",
++    "src/src/operators/pack-lh.c",
++    "src/src/operators/reduce-nd.c",
++    "src/src/operators/resize-bilinear-nchw.c",
++    "src/src/operators/resize-bilinear-nhwc.c",
++    "src/src/operators/rope-nthc.c",
++    "src/src/operators/slice-nd.c",
++    "src/src/operators/softmax-nc.c",
++    "src/src/operators/transpose-nd.c",
++    "src/src/operators/unary-elementwise-nc.c",
++    "src/src/operators/unpooling-nhwc.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62485,15 +77717,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-bf16-qb4w-gemm_arm64") {
++  source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme.c",
++    "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62514,15 +77746,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-bf16-qb4w-gemm_arm64_standalone") {
++  source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme.c",
++    "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62546,15 +77778,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c"
++      "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme.c",
++    "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme2.c",
++    "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme.c",
++    "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62575,15 +77809,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
++  source_set("pf16-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c"
++      "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme.c",
++    "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme2.c",
++    "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme.c",
++    "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62607,15 +77843,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16") {
++  source_set("pf32-gemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c",
-+    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c"
++      "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c",
++    "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c",
++    "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c",
++    "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62636,15 +77874,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16_standalone") {
++  source_set("pf32-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c",
-+    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c"
++      "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c",
++    "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c",
++    "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c",
++    "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62668,15 +77908,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("pf32-igemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme.c",
++    "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62697,15 +77937,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("pf32-igemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme.c",
++    "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62729,16 +77969,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-2x8c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-8x8c4-minmax-neondotfp16arith.c"
++      "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme.c",
++    "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62759,16 +77998,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc2w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
++  source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-2x8c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-8x8c4-minmax-neondotfp16arith.c"
++      "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme.c",
++    "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62792,14 +78030,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_arm64") {
++  source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-1x32c4-minmax-neonsme2.c",
++    "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme.c",
++    "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62820,14 +78060,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc2w-gemm_arm64_standalone") {
++  source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-1x32c4-minmax-neonsme2.c",
++    "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme.c",
++    "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62851,15 +78093,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("qb4-packw_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c4-minmax-neondotfp16arith.c"
++      "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c",
++    "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62880,15 +78122,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
++  source_set("qb4-packw_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c4-minmax-neondotfp16arith.c"
++      "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c",
++    "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62912,15 +78154,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16") {
++  source_set("qd8-bf16-qb4w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c"
++      "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x16c4-minmax-neondot.c",
++    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-4x16c4-minmax-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62941,15 +78183,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16_standalone") {
++  source_set("qd8-bf16-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c"
++      "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x16c4-minmax-neondot.c",
++    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-4x16c4-minmax-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62973,15 +78215,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-bf16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16+bf16") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+i8mm+fp16+bf16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x16c8-minmax-neoni8mmbf16.c",
++    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-4x16c8-minmax-neoni8mmbf16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63002,15 +78244,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("qd8-bf16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16+bf16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+i8mm+fp16+bf16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x16c8-minmax-neoni8mmbf16.c",
++    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-4x16c8-minmax-neoni8mmbf16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63034,17 +78276,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("qd8-bf16-qb4w-gemm_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x8c4-minmax-neondotfp16arith.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63065,17 +78305,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
++  source_set("qd8-bf16-qb4w-gemm_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x8c4-minmax-neondotfp16arith.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63099,15 +78337,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16") {
++  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c2s4-minmax-neonfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-2x8c2s4-minmax-neonfp16arith.c"
++      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63128,15 +78366,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16_standalone") {
++  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c2s4-minmax-neonfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-2x8c2s4-minmax-neonfp16arith.c"
++      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63160,17 +78398,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qd8-f16-qb4w-gemm_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/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondotfp16arith-cortex-a55.S"
++      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c",
++    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63191,17 +78427,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("qd8-f16-qb4w-gemm_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/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondotfp16arith-cortex-a55.S"
++      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c",
++    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63225,15 +78459,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63254,15 +78488,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63286,17 +78520,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("qd8-f16-qc2w-gemm_arch=armv8.2-a+dotprod+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x8c4-minmax-neondotfp16arith.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-2x8c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-8x8c4-minmax-neondotfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63317,17 +78550,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone") {
++  source_set("qd8-f16-qc2w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x8c4-minmax-neondotfp16arith.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-2x8c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-8x8c4-minmax-neondotfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63351,78 +78583,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16") {
++  source_set("qd8-f16-qc2w-gemm_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
-+    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c2s4-minmax-neonfp16arith-mlal.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-2x8c2s4-minmax-neonfp16arith-mlal.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-f16-qc8w-igemm_arch=armv8.2-a+fp16_standalone") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c2s4-minmax-neonfp16arith-mlal.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-2x8c2s4-minmax-neonfp16arith-mlal.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/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-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
-+    ]
-+  
-+  asmflags = cflags
-+
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63443,17 +78611,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("qd8-f16-qc2w-gemm_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63477,15 +78642,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c4-minmax-neondotfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63506,15 +78671,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c4-minmax-neondotfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63538,15 +78703,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c4-minmax-neondot.c"
++      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c",
++    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63567,15 +78732,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c4-minmax-neondot.c"
++      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c",
++    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63599,15 +78764,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63628,15 +78793,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63660,17 +78825,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_arm64") {
++  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16-minmax-neon-mlal-lane.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",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-6x16-minmax-neon-mlal-lane.c"
++      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x8c4-minmax-neondotfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63691,17 +78856,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_arm64_standalone") {
++  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16-minmax-neon-mlal-lane.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",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-6x16-minmax-neon-mlal-lane.c"
++      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x8c4-minmax-neondotfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63725,16 +78890,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-2x8c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-8x8c4-minmax-neondot.c"
++      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c2s4-minmax-neonfp16arith.c",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-2x8c2s4-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63755,16 +78919,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-2x8c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-8x8c4-minmax-neondot.c"
++      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c2s4-minmax-neonfp16arith.c",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-2x8c2s4-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63788,74 +78951,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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",
-+    ]
-+
-+    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_arm64_standalone") {
++  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
-+    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" ]
-+    }
-+  }
-+}
++  asmflags = cflags
 +
-+if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
-+    cflags = [
-+      "-march=armv8.2-a+dotprod"
-+    ]
-+  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c"
++      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondotfp16arith-cortex-a55.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63876,15 +78982,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c"
++      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondotfp16arith-cortex-a55.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63908,15 +79016,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63937,15 +79045,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63969,17 +79077,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arm64") {
++  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16-minmax-neon-mlal-lane.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-6x16-minmax-neon-mlal-lane.c"
++      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x8c4-minmax-neondotfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64000,17 +79108,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_arm64_standalone") {
++  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16-minmax-neon-mlal-lane.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-6x16-minmax-neon-mlal-lane.c"
++      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-neondotfp16arith.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x8c4-minmax-neondotfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64034,17 +79142,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c4-minmax-neondot.c"
++      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c2s4-minmax-neonfp16arith-mlal.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-2x8c2s4-minmax-neonfp16arith-mlal.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64065,17 +79171,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c4-minmax-neondot.c"
++      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c2s4-minmax-neonfp16arith-mlal.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-2x8c2s4-minmax-neonfp16arith-mlal.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64099,7 +79203,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16+dotprod"
 +    ]
@@ -64108,8 +79212,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
++      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64130,7 +79234,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16+dotprod"
 +    ]
@@ -64139,8 +79243,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
++      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64164,15 +79268,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64193,15 +79297,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64225,20 +79329,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arm64") {
++  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16-minmax-neon-mlal-lane-prfm.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-1x8c2s4-minmax-neon-mlal.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-2x8c2s4-minmax-neon-mlal.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16-minmax-neon-mlal-lane-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c4-minmax-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64259,20 +79358,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_arm64_standalone") {
++  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16-minmax-neon-mlal-lane-prfm.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-1x8c2s4-minmax-neon-mlal.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-2x8c2s4-minmax-neon-mlal.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16-minmax-neon-mlal-lane-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c4-minmax-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64296,17 +79390,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8c4-minmax-neondot.c"
++      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64327,17 +79419,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-neondot.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8c4-minmax-neondot.c"
++      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64361,17 +79451,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qd8-f32-qb4w-gemm_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
++      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16-minmax-neon-mlal-lane.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",
++    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-6x16-minmax-neon-mlal-lane.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64392,17 +79482,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("qd8-f32-qb4w-gemm_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
++      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16-minmax-neon-mlal-lane.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",
++    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-6x16-minmax-neon-mlal-lane.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64426,15 +79516,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-2x8c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-8x8c4-minmax-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64455,15 +79546,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-2x8c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-8x8c4-minmax-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64487,22 +79579,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arm64") {
++  source_set("qd8-f32-qc2w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16-minmax-neon-mlal-lane-prfm.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-1x8-minmax-neon-mlal-lane.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c2s4-minmax-neon-mlal.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-2x8c2s4-minmax-neon-mlal.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16-minmax-neon-mlal-lane-prfm.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8-minmax-neon-mlal-lane.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64523,22 +79607,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_arm64_standalone") {
++  source_set("qd8-f32-qc2w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16-minmax-neon-mlal-lane-prfm.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-1x8-minmax-neon-mlal-lane.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c2s4-minmax-neon-mlal.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-2x8c2s4-minmax-neon-mlal.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16-minmax-neon-mlal-lane-prfm.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8-minmax-neon-mlal-lane.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64562,16 +79638,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f32-qc4w-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"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64592,16 +79667,15 @@ Index: chromium-152.0.7977.64/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("qd8-f32-qc4w-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"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64625,14 +79699,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64653,14 +79728,15 @@ Index: chromium-152.0.7977.64/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") {
++  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64684,16 +79760,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f32-qc4w-gemm_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    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/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16-minmax-neon-mlal-lane.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-6x16-minmax-neon-mlal-lane.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64714,16 +79791,17 @@ Index: chromium-152.0.7977.64/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") {
++  source_set("qd8-f32-qc4w-gemm_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    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/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16-minmax-neon-mlal-lane.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-6x16-minmax-neon-mlal-lane.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64747,14 +79825,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c4-minmax-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64775,14 +79856,17 @@ Index: chromium-152.0.7977.64/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") {
++  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c4-minmax-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64806,17 +79890,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    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/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64837,17 +79921,17 @@ Index: chromium-152.0.7977.64/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+sve+sve2_standalone") {
++  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    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/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64871,16 +79955,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    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/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64901,16 +79984,15 @@ Index: chromium-152.0.7977.64/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") {
++  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    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/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64934,14 +80016,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-f32-qc8w-gemm_arm64") {
 +    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"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16-minmax-neon-mlal-lane-prfm.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-1x8c2s4-minmax-neon-mlal.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-2x8c2s4-minmax-neon-mlal.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16-minmax-neon-mlal-lane-prfm.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64962,14 +80050,20 @@ Index: chromium-152.0.7977.64/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") {
++  source_set("qd8-f32-qc8w-gemm_arm64_standalone") {
 +    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"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16-minmax-neon-mlal-lane-prfm.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-1x8c2s4-minmax-neon-mlal.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-2x8c2s4-minmax-neon-mlal.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16-minmax-neon-mlal-lane-prfm.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64993,17 +80087,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme.c",
-+    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme2.c",
-+    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme.c",
-+    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme2.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8c4-minmax-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65024,17 +80118,17 @@ Index: chromium-152.0.7977.64/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+sve+sve2_standalone") {
++  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme.c",
-+    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme2.c",
-+    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme.c",
-+    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme2.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8c4-minmax-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65058,20 +80152,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_arm64") {
++  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-rndnu-neon-mla8-ld64.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-rndnu-neon-mla8-ld64.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-rndnu-neon-mla8-ld64.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/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65092,20 +80183,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_arm64_standalone") {
++  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-rndnu-neon-mla8-ld64.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-rndnu-neon-mla8-ld64.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-rndnu-neon-mla8-ld64.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/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65129,14 +80217,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16") {
++  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65157,14 +80246,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16_standalone") {
++  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65188,15 +80278,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_arm64") {
++  source_set("qd8-f32-qc8w-igemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c",
-+    "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16-minmax-neon-mlal-lane-prfm.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-1x8-minmax-neon-mlal-lane.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c2s4-minmax-neon-mlal.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-2x8c2s4-minmax-neon-mlal.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16-minmax-neon-mlal-lane-prfm.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8-minmax-neon-mlal-lane.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65217,15 +80314,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_arm64_standalone") {
++  source_set("qd8-f32-qc8w-igemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c",
-+    "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16-minmax-neon-mlal-lane-prfm.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-1x8-minmax-neon-mlal-lane.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c2s4-minmax-neon-mlal.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-2x8c2s4-minmax-neon-mlal.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16-minmax-neon-mlal-lane-prfm.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8-minmax-neon-mlal-lane.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65249,15 +80353,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_arch=armv8.2-a+dotprod") {
++  source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c4-gemm-goi-neondot.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c4-gemm-goi-neondot.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" ]
@@ -65278,15 +80383,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_arch=armv8.2-a+dotprod_standalone") {
++  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/qs8-packw/gen/qs8-packw-x16c4-gemm-goi-neondot.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c4-gemm-goi-neondot.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" ]
@@ -65310,20 +80416,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_arm64") {
++  source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    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/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65344,20 +80444,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_arm64_standalone") {
++  source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    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/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65381,15 +80475,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-8x8c4-minmax-fp32-neondot.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" ]
@@ -65410,15 +80505,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-8x8c4-minmax-fp32-neondot.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" ]
@@ -65442,17 +80538,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_arm64") {
++  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/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/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65473,17 +80566,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_arm64_standalone") {
++  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    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/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65507,17 +80597,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x16-minmax-fp32-asm-aarch64-neondot-ld128.S"
++      "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" ]
@@ -65538,17 +80628,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x16-minmax-fp32-asm-aarch64-neondot-ld128.S"
++      "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" ]
@@ -65572,15 +80662,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_arm64") {
++  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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/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" ]
@@ -65601,15 +80692,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_arm64_standalone") {
++  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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/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" ]
@@ -65633,15 +80725,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-packw_arm64") {
++  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/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/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65662,15 +80753,79 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-packw_arm64_standalone") {
++  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    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: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-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
++    cflags = [
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    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/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme2.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-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",
++    ]
++
++    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"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme2.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65694,27 +80849,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_arm64") {
++  source_set("qs8-dwconv_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-neonv8-mla8-ld64.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-25p8c-minmax-fp32-neon-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-neonv8-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neon-mla8-ld128.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld128.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld64.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-9p16c-minmax-fp32-neon-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-neonv8-mla8-ld64.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-dwconv/gen/qs8-dwconv-25p16c-minmax-rndnu-neon-mla8-ld64.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-rndnu-neon-mla8-ld64.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-rndnu-neon-mla8-ld64.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" ]
@@ -65735,27 +80883,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_arm64_standalone") {
++  source_set("qs8-dwconv_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-neonv8-mla8-ld64.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-25p8c-minmax-fp32-neon-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-neonv8-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neon-mla8-ld128.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld128.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld64.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-9p16c-minmax-fp32-neon-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-neonv8-mla8-ld64.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-dwconv/gen/qs8-dwconv-25p16c-minmax-rndnu-neon-mla8-ld64.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-rndnu-neon-mla8-ld64.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-rndnu-neon-mla8-ld64.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" ]
@@ -65779,17 +80920,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c4-minmax-fp32-neondot.c"
++      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65810,17 +80948,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c4-minmax-fp32-neondot.c"
++      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65844,25 +80979,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qs8-f32-vcvt_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c",
++    "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65883,25 +81008,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("qs8-f32-vcvt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c",
++    "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65925,15 +81040,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qs8-packw_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-neoni8mm.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c8-minmax-fp32-neoni8mm.c"
++      "src/src/qs8-packw/gen/qs8-packw-x16c4-gemm-goi-neondot.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c4-gemm-goi-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65954,15 +81069,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("qs8-packw_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-neoni8mm.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c8-minmax-fp32-neoni8mm.c"
++      "src/src/qs8-packw/gen/qs8-packw-x16c4-gemm-goi-neondot.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c4-gemm-goi-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65986,20 +81101,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arm64") {
++  source_set("qs8-packw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16-minmax-fp32-neonv8-mlal-lane.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-1x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66020,20 +81135,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_arm64_standalone") {
++  source_set("qs8-packw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16-minmax-fp32-neonv8-mlal-lane.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-1x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66057,17 +81172,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod") {
++  source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c4-minmax-fp32-neondot.c"
++      "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-8x8c4-minmax-fp32-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66088,17 +81201,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c4-minmax-fp32-neondot.c"
++      "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-8x8c4-minmax-fp32-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66122,25 +81233,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qs8-qc2w-gemm_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S"
++      "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" ]
@@ -66161,25 +81264,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("qs8-qc2w-gemm_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S"
++      "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" ]
@@ -66203,15 +81298,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-fp32-neoni8mm.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c8-minmax-fp32-neoni8mm.c"
++      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
++    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x16-minmax-fp32-asm-aarch64-neondot-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66232,15 +81329,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-fp32-neoni8mm.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c8-minmax-fp32-neoni8mm.c"
++      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
++    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x16-minmax-fp32-asm-aarch64-neondot-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66264,20 +81363,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arm64") {
++  source_set("qs8-qc4w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16-minmax-fp32-neonv8-mlal-lane.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-1x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66298,20 +81392,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_arm64_standalone") {
++  source_set("qs8-qc4w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16-minmax-fp32-neonv8-mlal-lane.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-1x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66335,15 +81424,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_arm64") {
++  source_set("qs8-qc4w-packw_arm64") {
 +    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"
++      "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" ]
@@ -66364,15 +81453,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qu8-packw_arm64_standalone") {
++  source_set("qs8-qc4w-packw_arm64_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"
++      "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" ]
@@ -66396,428 +81485,182 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_arm64") {
++  source_set("qs8-qc8w-dwconv_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-neon-u32.c",
-+    "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-neonv8-mla8-ld64.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-25p8c-minmax-fp32-neon-mla8-ld64.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-neonv8-mla8-ld64.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neon-mla8-ld128.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld128.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld64.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-9p16c-minmax-fp32-neon-mla8-ld64.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-neonv8-mla8-ld64.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" ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//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("qs8-rdsum_arm64_standalone") {
++  source_set("qs8-qc8w-dwconv_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-neon-u32.c",
-+    "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-neonv8-mla8-ld64.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-25p8c-minmax-fp32-neon-mla8-ld64.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-neonv8-mla8-ld64.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neon-mla8-ld128.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld128.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld64.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-9p16c-minmax-fp32-neon-mla8-ld64.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-neonv8-mla8-ld64.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 = [
--        "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" ]
++
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_arch=armv8.2-a+dotprod") {
++  source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c4-minmax-fp32-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" ]
- 
--      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",
--      ]
++
 +    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_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_arch=armv8.2-a+dotprod_standalone") {
++  source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c4-minmax-fp32-neondot.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: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_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" ]
--      }
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_arm64") {
++  source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-neon-u32-acc2.c",
-+    "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -66826,178 +81669,69 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vrnd_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_arm64_standalone") {
++  source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-neon-u32-acc2.c",
-+    "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S"
 +    ]
- 
--      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",
--      ]
++
 +    configs -= [ "//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_x64_standalone") {
--      cflags = []
++
 +    public_configs = [ ":xnnpack_public_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: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_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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_arm64") {
++  source_set("qs8-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u16.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u32.c",
-+    "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-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-neoni8mm.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c8-minmax-fp32-neoni8mm.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-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -67006,686 +81740,276 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vrsqrt_avx512f") {
--      cflags = [ "-mavx512f" ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_arm64_standalone") {
++  source_set("qs8-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u16.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u32.c",
-+    "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-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-neoni8mm.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c8-minmax-fp32-neoni8mm.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" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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-vrsqrt_avx512f_standalone") {
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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-vaddc_arm64") {
++  source_set("qs8-qc8w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-neon-ld64-u16.c",
-+    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-neon-ld64-u32.c",
-+    "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-qc8w-gemm/gen/qs8-qc8w-gemm-1x16-minmax-fp32-neonv8-mlal-lane.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-1x8c2s4-minmax-fp32-neon-mlal.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neon-mlal.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vrsqrt_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_arm64_standalone") {
++  source_set("qs8-qc8w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-neon-ld64-u16.c",
-+    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-neon-ld64-u32.c",
-+    "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-qc8w-gemm/gen/qs8-qc8w-gemm-1x16-minmax-fp32-neonv8-mlal-lane.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-1x8c2s4-minmax-fp32-neon-mlal.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neon-mlal.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.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" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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-vrsqrt_x64_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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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-vcvt_arm64") {
++  source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
-+    "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c4-minmax-fp32-neondot.c"
 +    ]
- 
--  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",
 +    ]
- 
--  # 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 (build_with_chromium) {
--    source_set("f32-vsigmoid_avx512f") {
--      cflags = [ "-mavx512f" ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_arm64_standalone") {
++  source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
-+    "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-neondot.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c4-minmax-fp32-neondot.c"
 +    ]
- 
--      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" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
++
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_arm64") {
++  source_set("qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-neon-u32.c",
-+    "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S"
 +    ]
- 
--      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",
 +    ]
- 
--      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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_arm64_standalone") {
++  source_set("qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-neon-u32.c",
-+    "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
-+    ]
- 
--  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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//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/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.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" ]
- 
--      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_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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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_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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_arm64") {
++  source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
-+    "src/src/qs8-vmul/gen/qs8-vmul-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-fp32-neoni8mm.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c8-minmax-fp32-neoni8mm.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_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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -67694,577 +82018,245 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    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("qs8-vmul_arm64_standalone") {
++  source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
-+    "src/src/qs8-vmul/gen/qs8-vmul-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-fp32-neoni8mm.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c8-minmax-fp32-neoni8mm.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("qs8-vmulc_arm64") {
++  source_set("qs8-qc8w-igemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c",
-+    "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16-minmax-fp32-neonv8-mlal-lane.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-1x8c2s4-minmax-fp32-neon-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neon-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.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("qs8-vmulc_arm64_standalone") {
++  source_set("qs8-qc8w-igemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c",
-+    "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16-minmax-fp32-neonv8-mlal-lane.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-1x8c2s4-minmax-fp32-neon-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neon-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.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("qs8-vprelu_arm64") {
++  source_set("qs8-qu8-packw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.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 = [
--        "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("qs8-vprelu_arm64_standalone") {
++  source_set("qs8-qu8-packw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.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"
 +    ]
- 
--  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("qs8-vpreluc_arm64") {
++  source_set("qs8-rdsum_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-neon-u32.c",
++    "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" ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//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("qs8-vpreluc_arm64_standalone") {
++  source_set("qs8-rdsum_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-neon-u32.c",
++    "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.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" ]
++
++    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-vsqrt_avx-no-avx2-no-f16c-no-fma_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qu8-vcvt_sse4.1-no-sse4.2") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      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",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68276,136 +82268,52 @@ Index: chromium-152.0.7977.64/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("f32-vsqrt_avx512f") {
--      cflags = [ "-mavx512f" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c",
+-        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_arm64") {
++  source_set("qs8-rsum_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-neondot-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("f32-vsqrt_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vrpreluc_arm64_standalone") {
++  source_set("qs8-rsum_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.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",
@@ -68414,60 +82322,23 @@ Index: chromium-152.0.7977.64/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-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 (build_with_chromium) {
-+  source_set("qu8-dwconv_arm64") {
++  source_set("qs8-rsum_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-rndnu-neon-mul8.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-rndnu-neon-mul8.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-neon-u32-acc2.c",
++    "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68483,190 +82354,85 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vsqrt_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_arm64_standalone") {
++  source_set("qs8-rsum_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-rndnu-neon-mul8.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-rndnu-neon-mul8.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-neon-u32-acc2.c",
++    "src/src/qs8-rsum/gen/qs8-rsum-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" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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-vsqrt_x64_standalone") {
--      cflags = []
++
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_arm64") {
++  source_set("qs8-vadd_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
-+    "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u16.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u32.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-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",
 +    ]
- 
--      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" ]
--      }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_arm64_standalone") {
++  source_set("qs8-vadd_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
-+    "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u16.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u32.c",
++    "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" ]
@@ -68685,265 +82451,92 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vtanh_avx512f") {
--      cflags = [ "-mavx512f" ]
++
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qs8-vaddc_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.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",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-neon-ld64-u16.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-neon-ld64-u32.c",
++    "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",
--      ]
++
 +    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-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
-+    ]
-+  
-+  asmflags = 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" ]
--      }
--    }
--  }
++      "//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("qs8-vaddc_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-neon-ld64-u16.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-neon-ld64-u32.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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-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" ]
--      }
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    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-gemm_arm64") {
++  source_set("qs8-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
++    "src/src/qs8-vcvt/gen/qs8-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("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",
@@ -68952,361 +82545,120 @@ Index: chromium-152.0.7977.64/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-gemm_arm64_standalone") {
++  source_set("qs8-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
++    "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-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 = []
++
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qs8-vlrelu_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = 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" ]
--      }
--    }
--  }
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-neon-u32.c",
++    "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-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" ]
--
--      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",
--      ]
++
 +# 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") {
++  source_set("qs8-vlrelu_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  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" ]
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-neon-u32.c",
++    "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-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:pthreadpool_standalone",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vunary_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      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 (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_arm64") {
++  source_set("qs8-vmul_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
++    "src/src/qs8-vmul/gen/qs8-vmul-minmax-rndnu-neon-ld64-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-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -69315,109 +82667,54 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    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-igemm_arm64_standalone") {
++  source_set("qs8-vmul_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
++    "src/src/qs8-vmul/gen/qs8-vmul-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 = []
++
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_arm64") {
++  source_set("qs8-vmulc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c",
-+    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
-+    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c",
++    "src/src/qs8-vmulc/gen/qs8-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" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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" ]
@@ -69431,213 +82728,58 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("operators_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_arm64_standalone") {
++  source_set("qs8-vmulc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c",
-+    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
-+    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c",
++    "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-rndnu-neon-ld64-u16.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",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("operators_x64_standalone") {
--      cflags = []
++
 +    public_configs = [ ":xnnpack_public_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: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-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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_arm64") {
++  source_set("qs8-vprelu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c",
-+    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-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-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -69646,360 +82788,116 @@ Index: chromium-152.0.7977.64/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-rsum_arm64_standalone") {
++  source_set("qs8-vprelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c",
-+    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-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 = []
++
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_arm64") {
++  source_set("qs8-vpreluc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qs8-vpreluc/gen/qs8-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" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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",
 +    ]
- 
--      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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_arm64_standalone") {
++  source_set("qs8-vpreluc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-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" ]
--      }
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_arm64") {
++  source_set("qs8-vrpreluc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-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-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",
@@ -70008,364 +82906,127 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qd8-f16-qc2w-gemm_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_arm64_standalone") {
++  source_set("qs8-vrpreluc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.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" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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-f16-qc2w-gemm_x64_standalone") {
--      cflags = []
++
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_arm64") {
++  source_set("qu8-dwconv_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
-+    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-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-25p8c-minmax-rndnu-neon-mul8.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-rndnu-neon-mul8.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/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",
 +    ]
- 
--      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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_arm64_standalone") {
++  source_set("qu8-dwconv_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
-+    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-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-25p8c-minmax-rndnu-neon-mul8.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-rndnu-neon-mul8.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"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-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" ]
--      }
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_arm64") {
++  source_set("qu8-f32-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
-+    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
++    "src/src/qu8-f32-vcvt/gen/qu8-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(
--        "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",
@@ -70374,1512 +83035,395 @@ Index: chromium-152.0.7977.64/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-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_arm64_standalone") {
++  source_set("qu8-f32-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
-+    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
++    "src/src/qu8-f32-vcvt/gen/qu8-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(
--        "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" ]
--      }
--    }
--  }
++
 +    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_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",
--      ]
++
 +    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_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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_arm64") {
++  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
-+    "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_arm64_standalone") {
++  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
-+    "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//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_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" ]
--      }
--    }
--  }
++
 +    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-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",
--      ]
++
 +    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-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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_arm64") {
++  source_set("qu8-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
-+    "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "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",
--      ]
++
 +    configs -= [ "//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-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_arm64_standalone") {
++  source_set("qu8-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
-+    "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c"
 +    ]
- 
--      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_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" ]
--      }
--    }
--  }
-+    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-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",
--      ]
-+    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-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" ]
--      }
--    }
--  }
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/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") {
++  source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_arm64_standalone") {
++  source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//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-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" ]
--      }
--    }
--  }
++
 +    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-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",
--      ]
++
 +    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-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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_arm64") {
++  source_set("qu8-igemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vpreluc_arm64_standalone") {
++  source_set("qu8-igemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//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-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" ]
--      }
--    }
--  }
++
 +    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-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",
--      ]
++
 +    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-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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_arm64") {
++  source_set("qu8-rdsum_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c",
++    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
++    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
- 
--  if (build_with_chromium) {
--    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",
--      ]
++
 +    configs -= [ "//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-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vrpreluc_arm64_standalone") {
++  source_set("qu8-rdsum_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c",
++    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
++    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//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_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" ]
--      }
--    }
--  }
++
 +    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_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",
--      ]
++
 +    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_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" ]
--      }
--    }
++
 +if (build_with_chromium) {
-+  source_set("reference_arm64") {
++  source_set("qu8-rsum_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c",
++    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71895,355 +83439,126 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    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("reference_arm64_standalone") {
++  source_set("qu8-rsum_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "src/src/qu8-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/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 = []
++
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_arm64") {
++  source_set("qu8-vadd_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c",
-+    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
-+    "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
- 
--      sources = [
--        "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" ]
--      }
--    }
--  }
++
 +    configs -= [ "//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_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",
--      ]
++
 +    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_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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_arm64_standalone") {
++  source_set("qu8-vadd_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c",
-+    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
-+    "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
- 
--  if (build_with_chromium) {
--    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",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-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" ]
--      }
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_arm64") {
++  source_set("qu8-vaddc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c",
-+    "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
- 
--      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-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -72252,374 +83567,122 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc2w-gemm_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_arm64_standalone") {
++  source_set("qu8-vaddc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c",
-+    "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
- 
--      sources = [
--        "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" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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-qc2w-gemm_x64_standalone") {
--      cflags = []
++
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_arm64") {
++  source_set("qu8-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-u32.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-u32.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
++    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.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",
 +    ]
- 
--      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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_arm64_standalone") {
++  source_set("qu8-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-u32.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-u32.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
++    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-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" ]
--      }
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f32-qc4w-gemm_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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_arm64") {
++  source_set("qu8-vlrelu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/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(
--        "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",
@@ -72628,579 +83691,149 @@ Index: chromium-152.0.7977.64/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-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_arm64_standalone") {
++  source_set("qu8-vlrelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/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(
--        "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" ]
--      }
--    }
--  }
++
 +    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-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",
--      ]
++
 +    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-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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_arm64") {
++  source_set("qu8-vmul_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-neon-u64.c",
-+    "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/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(
--        "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",
--      ]
++
 +    configs -= [ "//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-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_arm64_standalone") {
++  source_set("qu8-vmul_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-neon-u64.c",
-+    "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
++    "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//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_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" ]
--      }
--    }
--  }
++
 +    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_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",
--      ]
++
 +    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_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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("subgraph_arm64") {
++  source_set("qu8-vmulc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/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/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("qd8-f32-qc4w-gemm_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/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c",
--      ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      configs -= [ "//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("subgraph_arm64_standalone") {
++  source_set("qu8-vmulc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/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/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
++    "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc4w-gemm_x64_standalone") {
--      cflags = []
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -73209,125 +83842,29 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      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 (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("tables_arm64") {
++  source_set("qu8-vprelu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/tables/exp2-k-over-2048.c",
-+    "src/src/tables/exp2-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-16.c",
-+    "src/src/tables/exp2minus-k-over-2048.c",
-+    "src/src/tables/exp2minus-k-over-32.c",
-+    "src/src/tables/exp2minus-k-over-4.c",
-+    "src/src/tables/exp2minus-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-8.c",
-+    "src/src/tables/vlog.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-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-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -73336,1618 +83873,432 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    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("tables_arm64_standalone") {
++  source_set("qu8-vprelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/tables/exp2-k-over-2048.c",
-+    "src/src/tables/exp2-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-16.c",
-+    "src/src/tables/exp2minus-k-over-2048.c",
-+    "src/src/tables/exp2minus-k-over-32.c",
-+    "src/src/tables/exp2minus-k-over-4.c",
-+    "src/src/tables/exp2minus-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-8.c",
-+    "src/src/tables/vlog.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-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-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("u8-ibilinear_arm64") {
++  source_set("qu8-vpreluc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u16.c",
-+    "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c",
-+    "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.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("u8-ibilinear_arm64_standalone") {
++  source_set("qu8-vpreluc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u16.c",
-+    "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c",
-+    "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/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-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("u8-lut32norm_arm64") {
++  source_set("qu8-vrpreluc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.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("u8-lut32norm_arm64_standalone") {
++  source_set("qu8-vrpreluc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.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("u8-maxpool_arm64") {
++  source_set("reference_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
-+    "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
- 
--  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("u8-maxpool_arm64_standalone") {
++  source_set("reference_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
-+    "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
- 
--      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("u8-rdminmax_arm64") {
++  source_set("s8-ibilinear_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-u32.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c",
++    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
++    "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
- 
--  if (build_with_chromium) {
--    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("u8-rdminmax_arm64_standalone") {
++  source_set("s8-ibilinear_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-u32.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c",
++    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
++    "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
- 
--      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" ]
--      }
--    }
--  }
++      "//third_party/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") {
++  source_set("s8-maxpool_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/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-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("u8-rminmax_arm64_standalone") {
++  source_set("s8-maxpool_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c",
++    "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.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 = []
++
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_arm64") {
++  source_set("s8-rdminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
-+    "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-u32.c",
++    "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-u32.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
- 
--      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" ]
--      }
--    }
--  }
++
 +    configs -= [ "//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_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",
--      ]
++
 +    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-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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_arm64_standalone") {
++  source_set("s8-rdminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
-+    "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-u32.c",
++    "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-u32.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
- 
--  if (build_with_chromium) {
--    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",
--      ]
++
 +    configs -= [ "//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-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" ]
--      }
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("s8-rminmax_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c",
-+    "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c",
-+    "src/src/x16-pack-lh/x16-packlh-neonsme.c",
-+    "src/src/x16-pack-lh/x16-packlh-neonsme2.c"
++      "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
- 
--      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-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -74956,422 +84307,152 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("s8-rminmax_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c",
-+    "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c",
-+    "src/src/x16-pack-lh/x16-packlh-neonsme.c",
-+    "src/src/x16-pack-lh/x16-packlh-neonsme2.c"
++      "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
- 
--      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_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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  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" ]
- 
--      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_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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("x16-packw_arm64") {
++  source_set("s8-vclamp_arm64") {
 +    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-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"
++      "src/src/s8-vclamp/s8-vclamp-neon-u64.c",
++    "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-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/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",
--      ]
++
 +    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-dwconv_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-packw_arm64_standalone") {
++  source_set("s8-vclamp_arm64_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-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"
++      "src/src/s8-vclamp/s8-vclamp-neon-u64.c",
++    "src/src/s8-vclamp/s8-vclamp-scalar-u4.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: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-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" ]
--      }
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("x16-transposec_arm64") {
++  source_set("subgraph_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
-+    "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c"
++      "src/src/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"
 +    ]
- 
--      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_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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -75380,292 +84461,188 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_arm64_standalone") {
++  source_set("subgraph_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
-+    "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c"
++      "src/src/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"
 +    ]
- 
--      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",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  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",
--      ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("tables_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/tables/exp2-k-over-2048.c",
++    "src/src/tables/exp2-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-16.c",
++    "src/src/tables/exp2minus-k-over-2048.c",
++    "src/src/tables/exp2minus-k-over-32.c",
++    "src/src/tables/exp2minus-k-over-4.c",
++    "src/src/tables/exp2minus-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-8.c",
++    "src/src/tables/vlog.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//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("tables_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/tables/exp2-k-over-2048.c",
++    "src/src/tables/exp2-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-16.c",
++    "src/src/tables/exp2minus-k-over-2048.c",
++    "src/src/tables/exp2minus-k-over-32.c",
++    "src/src/tables/exp2minus-k-over-4.c",
++    "src/src/tables/exp2minus-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-8.c",
++    "src/src/tables/vlog.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  # 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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_arm64") {
++  source_set("u8-ibilinear_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
-+    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u16.c",
++    "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c",
++    "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-x32-packw_arm64_standalone") {
++  source_set("u8-ibilinear_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
-+    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u16.c",
++    "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c",
++    "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -75682,52 +84659,19 @@ Index: chromium-152.0.7977.64/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("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" ]
--      }
--    }
++
 +if (build_with_chromium) {
-+  source_set("x24-transposec_arm64") {
++  source_set("u8-lut32norm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c",
-+    "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c",
-+    "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75743,383 +84687,121 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    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("x24-transposec_arm64_standalone") {
++  source_set("u8-lut32norm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c",
-+    "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c",
-+    "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-f32-vcvt_x64_standalone") {
--      cflags = []
++
 +if (build_with_chromium) {
-+  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("u8-maxpool_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-pack-lh/x32-packlh-igemm-neonsme.c",
-+    "src/src/x32-pack-lh/x32-packlh-igemm-neonsme2.c",
-+    "src/src/x32-pack-lh/x32-packlh-neonsme.c",
-+    "src/src/x32-pack-lh/x32-packlh-neonsme2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
++    "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
- 
--      sources = [
--        "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" ]
--      }
--    }
--  }
++
 +    configs -= [ "//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-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",
--      ]
++
 +    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_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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("u8-maxpool_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-pack-lh/x32-packlh-igemm-neonsme.c",
-+    "src/src/x32-pack-lh/x32-packlh-igemm-neonsme2.c",
-+    "src/src/x32-pack-lh/x32-packlh-neonsme.c",
-+    "src/src/x32-pack-lh/x32-packlh-neonsme2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
++    "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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-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" ]
--      }
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx256vnni-prfm.c",
--        "src/src/qs8-packw/gen/qs8-packw-x64c4-gemm-goi-avx256vnni-prfm.c",
--        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx256vnni-prfm.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("x32-packw_arm64") {
++  source_set("u8-rdminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c",
-+    "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x32-gemm-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-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-u32.c",
++    "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
- 
--      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-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -76128,197 +84810,65 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-packw_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_arm64_standalone") {
++  source_set("u8-rdminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c",
-+    "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x32-gemm-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-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-u32.c",
++    "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
- 
--      sources = [
--        "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",
--      ]
++
 +    configs -= [ "//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-packw_x64_standalone") {
--      cflags = []
++
 +    public_configs = [ ":xnnpack_public_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: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_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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("x32-transposec_arm64") {
++  source_set("u8-rminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
-+    "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c",
-+    "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c"
++      "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
- 
--      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_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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -76327,430 +84877,126 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_arm64_standalone") {
++  source_set("u8-rminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
-+    "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c",
-+    "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c"
++      "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
- 
--      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_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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  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",
--      ]
++
 +    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-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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("x32-unpool_arm64") {
++  source_set("u8-vclamp_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-neon.c",
-+    "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
++    "src/src/u8-vclamp/u8-vclamp-scalar-u4.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",
 +    ]
- 
--  # 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 (build_with_chromium) {
--    source_set("qs8-qc2w-gemm_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-unpool_arm64_standalone") {
++  source_set("u8-vclamp_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-neon.c",
-+    "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
++    "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
- 
--      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",
--      ]
++
 +    configs -= [ "//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_x64_standalone") {
--      cflags = []
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      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" ]
--      }
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("x64-transposec_arm64") {
++  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c",
-+    "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c",
-+    "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c",
++    "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c",
++    "src/src/x16-pack-lh/x16-packlh-neonsme.c",
++    "src/src/x16-pack-lh/x16-packlh-neonsme2.c"
 +    ]
- 
--      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",
@@ -76759,448 +85005,123 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_arm64_standalone") {
++  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c",
-+    "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c",
-+    "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c",
++    "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c",
++    "src/src/x16-pack-lh/x16-packlh-neonsme.c",
++    "src/src/x16-pack-lh/x16-packlh-neonsme2.c"
 +    ]
- 
--      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_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" ]
--      }
--    }
--  }
++
 +    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-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",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc4w-gemm_f16c-fma-avx2_standalone") {
--      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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("x8-lut_arm64") {
++  source_set("x16-packw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c",
-+    "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/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(
--        "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",
--      ]
++
 +    configs -= [ "//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-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_arm64_standalone") {
++  source_set("x16-packw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c",
-+    "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/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"
 +    ]
- 
--      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-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc4w-gemm_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-ssse3-madd-prfm.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc4w-gemm_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" ]
--      }
--    }
++
 +if (build_with_chromium) {
-+  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("x16-transposec_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-pack-lh/x8-packlh-igemm-neonsme.c",
-+    "src/src/x8-pack-lh/x8-packlh-igemm-neonsme2.c",
-+    "src/src/x8-pack-lh/x8-packlh-neonsme.c",
-+    "src/src/x8-pack-lh/x8-packlh-neonsme2.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
++    "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77216,386 +85137,121 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    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("x8-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("x16-transposec_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-pack-lh/x8-packlh-igemm-neonsme.c",
-+    "src/src/x8-pack-lh/x8-packlh-igemm-neonsme2.c",
-+    "src/src/x8-pack-lh/x8-packlh-neonsme.c",
-+    "src/src/x8-pack-lh/x8-packlh-neonsme2.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
++    "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c"
 +    ]
- 
--      sources = [
--        "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("x8-packq_arm64") {
++  source_set("x16-x32-packw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
-+    "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "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 = [
--        "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("x8-packq_arm64_standalone") {
++  source_set("x16-x32-packw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
-+    "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "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(
--        "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-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-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-qc4w-packw-x4c8-gemm-goi-sse2.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-qc4w-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",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-packw-x4c8-gemm-goi-sse2.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-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("x8-packw_arm64") {
++  source_set("x24-transposec_arm64") {
 +    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/x24-transposec/gen/x24-transposec-1x2-scalar.c",
++    "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c",
++    "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c"
 +    ]
- 
--      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-qc4w-packw-x4c8-gemm-goi-sse2.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-qc4w-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",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-packw-x4c8-gemm-goi-sse2.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-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",
@@ -77604,694 +85260,211 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packw_arm64_standalone") {
++  source_set("x24-transposec_arm64_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/x24-transposec/gen/x24-transposec-1x2-scalar.c",
++    "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c",
++    "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c"
 +    ]
- 
--      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_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" ]
--      }
--    }
--  }
++
 +    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-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",
--      ]
++
 +    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-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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("x8-transposec_arm64") {
++  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/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-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",
--      ]
++      "src/include/xnnpack.h",
++      "src/src/x32-pack-lh/x32-packlh-igemm-neonsme.c",
++    "src/src/x32-pack-lh/x32-packlh-igemm-neonsme2.c",
++    "src/src/x32-pack-lh/x32-packlh-neonsme.c",
++    "src/src/x32-pack-lh/x32-packlh-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" ]
- 
--      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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_arm64_standalone") {
++  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c",
-+    "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/x32-pack-lh/x32-packlh-igemm-neonsme.c",
++    "src/src/x32-pack-lh/x32-packlh-igemm-neonsme2.c",
++    "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-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  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" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone") {
--      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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("xx-copy_arm64") {
++  source_set("x32-packw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-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-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-qc8w-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/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",
--      ]
++
 +    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_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-copy_arm64_standalone") {
++  source_set("x32-packw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-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-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"
 +    ]
- 
--      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: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-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-avx-ld128.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("xx-fill_arm64") {
++  source_set("x32-transposec_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-neon-u64.c",
-+    "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
++    "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c",
++    "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c"
 +    ]
- 
--      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-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -78300,617 +85473,152 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-fill_arm64_standalone") {
++  source_set("x32-transposec_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-neon-u64.c",
-+    "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
++    "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c",
++    "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c"
 +    ]
- 
--      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",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  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",
--      ]
++
 +    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-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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("xx-pad_arm64") {
++  source_set("x32-unpool_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/x32-unpool/x32-unpool-neon.c",
++    "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-pad_arm64_standalone") {
++  source_set("x32-unpool_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p16-neon-u16.c",
-+    "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++      "src/src/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-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" ]
--      }
--    }
--  }
++
 +    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-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",
--      ]
++
 +    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-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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("xx-transposev_arm64") {
++  source_set("x64-transposec_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c",
++    "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c",
++    "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
- 
--  if (build_with_chromium) {
--    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",
--      ]
++
 +    configs -= [ "//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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-transposev_arm64_standalone") {
++  source_set("x64-transposec_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c",
++    "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c",
++    "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
- 
--      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_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" ]
--      }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -78920,266 +85628,92 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +    public_configs = [ ":xnnpack_public_config" ]
 +
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-gemm_x64") {
--      cflags = []
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
 +}
- 
--      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",
--      ]
-+if (current_cpu == "riscv64") {
++
 +if (build_with_chromium) {
-+  source_set("bf16-f32-vcvt_riscv64") {
++  source_set("x8-lut_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
++      "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c",
++    "src/src/x8-lut/gen/x8-lut-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("qs8-qc8w-gemm_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-f32-vcvt_riscv64_standalone") {
++  source_set("x8-lut_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
++      "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c",
++    "src/src/x8-lut/gen/x8-lut-scalar-u4.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: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_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" ]
--      }
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("bf16-qs8-vcvt_riscv64") {
++  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/x8-pack-lh/x8-packlh-igemm-neonsme.c",
++    "src/src/x8-pack-lh/x8-packlh-igemm-neonsme2.c",
++    "src/src/x8-pack-lh/x8-packlh-neonsme.c",
++    "src/src/x8-pack-lh/x8-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-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",
@@ -79188,618 +85722,163 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-qs8-vcvt_riscv64_standalone") {
++  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/x8-pack-lh/x8-packlh-igemm-neonsme.c",
++    "src/src/x8-pack-lh/x8-packlh-igemm-neonsme2.c",
++    "src/src/x8-pack-lh/x8-packlh-neonsme.c",
++    "src/src/x8-pack-lh/x8-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-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",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  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",
--      ]
++
 +    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-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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("bf16-qu8-vcvt_riscv64") {
++  source_set("x8-packq_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.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-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",
--      ]
++
 +    configs -= [ "//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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-qu8-vcvt_riscv64_standalone") {
++  source_set("x8-packq_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
++    "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//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_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" ]
--      }
--    }
--  }
++
 +    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-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",
--      ]
++
 +    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-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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("bf16-rminmax_riscv64") {
++  source_set("x8-packw_arm64") {
 +    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/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) {
--    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",
--      ]
++
 +    configs -= [ "//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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-rminmax_riscv64_standalone") {
++  source_set("x8-packw_arm64_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/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"
 +    ]
- 
--      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_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" ]
--      }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -79811,318 +85890,87 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +    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("configs_riscv64") {
++  source_set("x8-transposec_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/configs/argmaxpool-config.c",
-+    "src/src/configs/avgpool-config.c",
-+    "src/src/configs/binary-elementwise-config.c",
-+    "src/src/configs/cmul-config.c",
-+    "src/src/configs/conv-hwc2chw-config.c",
-+    "src/src/configs/dwconv-config.c",
-+    "src/src/configs/dwconv2d-chw-config.c",
-+    "src/src/configs/gemm-config.c",
-+    "src/src/configs/hardware-config.c",
-+    "src/src/configs/ibilinear-chw-config.c",
-+    "src/src/configs/ibilinear-config.c",
-+    "src/src/configs/lut32norm-config.c",
-+    "src/src/configs/maxpool-config.c",
-+    "src/src/configs/pack-lh-config.c",
-+    "src/src/configs/raddstoreexpminusmax-config.c",
-+    "src/src/configs/reduce-config.c",
-+    "src/src/configs/spmm-config.c",
-+    "src/src/configs/transpose-config.c",
-+    "src/src/configs/unary-elementwise-config.c",
-+    "src/src/configs/unpool-config.c",
-+    "src/src/configs/vmulcaddc-config.c",
-+    "src/src/configs/x8-lut-config.c",
-+    "src/src/configs/xx-fill-config.c",
-+    "src/src/configs/xx-pad-config.c"
++      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c",
++    "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
- 
--      configs -= [ "//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-qc8w-igemm_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("configs_riscv64_standalone") {
++  source_set("x8-transposec_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/configs/argmaxpool-config.c",
-+    "src/src/configs/avgpool-config.c",
-+    "src/src/configs/binary-elementwise-config.c",
-+    "src/src/configs/cmul-config.c",
-+    "src/src/configs/conv-hwc2chw-config.c",
-+    "src/src/configs/dwconv-config.c",
-+    "src/src/configs/dwconv2d-chw-config.c",
-+    "src/src/configs/gemm-config.c",
-+    "src/src/configs/hardware-config.c",
-+    "src/src/configs/ibilinear-chw-config.c",
-+    "src/src/configs/ibilinear-config.c",
-+    "src/src/configs/lut32norm-config.c",
-+    "src/src/configs/maxpool-config.c",
-+    "src/src/configs/pack-lh-config.c",
-+    "src/src/configs/raddstoreexpminusmax-config.c",
-+    "src/src/configs/reduce-config.c",
-+    "src/src/configs/spmm-config.c",
-+    "src/src/configs/transpose-config.c",
-+    "src/src/configs/unary-elementwise-config.c",
-+    "src/src/configs/unpool-config.c",
-+    "src/src/configs/vmulcaddc-config.c",
-+    "src/src/configs/x8-lut-config.c",
-+    "src/src/configs/xx-fill-config.c",
-+    "src/src/configs/xx-pad-config.c"
++      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c",
++    "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/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("enums_riscv64") {
++  source_set("xx-copy_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/enums/allocation-type.c",
-+    "src/src/enums/datatype-strings.c",
-+    "src/src/enums/microkernel-type.c",
-+    "src/src/enums/node-type.c",
-+    "src/src/enums/operator-type.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.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",
@@ -80131,358 +85979,119 @@ Index: chromium-152.0.7977.64/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("enums_riscv64_standalone") {
++  source_set("xx-copy_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/enums/allocation-type.c",
-+    "src/src/enums/datatype-strings.c",
-+    "src/src/enums/microkernel-type.c",
-+    "src/src/enums/node-type.c",
-+    "src/src/enums/operator-type.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.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 = []
++
 +if (build_with_chromium) {
-+  source_set("f16-avgpool_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("xx-fill_arm64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-rvvfp16arith-u2v.c"
++      "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-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",
 +    ]
- 
--      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" ]
--      }
--    }
--  }
++
 +# 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") {
++  source_set("xx-fill_arm64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-rvvfp16arith-u2v.c"
++      "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-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",
--      ]
++
 +    configs -= [ "//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-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" ]
--      }
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("xx-pad_arm64") {
 +    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/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-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",
@@ -80491,517 +86100,148 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-rdsum_x64") {
--      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("xx-pad_arm64_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/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-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" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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-rdsum_x64_standalone") {
--      cflags = []
--
--      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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("xx-transposev_arm64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# 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("xx-transposev_arm64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.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",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  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",
--      ]
++
 +    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_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" ]
--      }
--    }
--  }
++
++}
++
++if (current_cpu == "riscv64") {
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_riscv64") {
++  source_set("bf16-f32-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_riscv64_standalone") {
++  source_set("bf16-f32-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-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-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" ]
--      }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -81013,255 +86253,146 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-rsum_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("bf16-qs8-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.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" ]
--      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-rsum_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("bf16-qs8-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.c"
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.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" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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-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",
--      ]
++
 +    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-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" ]
--      }
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("bf16-qu8-vcvt_riscv64") {
++    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" ]
++
++    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-qu8-vcvt_riscv64_standalone") {
++    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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/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-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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("bf16-rminmax_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/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" ]
--    }
--  }
++
 +    configs -= [ "//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",
@@ -81270,587 +86401,217 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# 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("bf16-rminmax_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/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" ]
--    }
--  }
++
 +    configs -= [ "//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-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  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",
--      ]
++
 +    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_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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("configs_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.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"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vadd_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("configs_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c"
++      "src/src/configs/argmaxpool-config.c",
++    "src/src/configs/avgpool-config.c",
++    "src/src/configs/binary-elementwise-config.c",
++    "src/src/configs/cmul-config.c",
++    "src/src/configs/conv-hwc2chw-config.c",
++    "src/src/configs/dwconv-config.c",
++    "src/src/configs/dwconv2d-chw-config.c",
++    "src/src/configs/gemm-config.c",
++    "src/src/configs/hardware-config.c",
++    "src/src/configs/ibilinear-chw-config.c",
++    "src/src/configs/ibilinear-config.c",
++    "src/src/configs/lut32norm-config.c",
++    "src/src/configs/maxpool-config.c",
++    "src/src/configs/pack-lh-config.c",
++    "src/src/configs/raddstoreexpminusmax-config.c",
++    "src/src/configs/reduce-config.c",
++    "src/src/configs/spmm-config.c",
++    "src/src/configs/transpose-config.c",
++    "src/src/configs/unary-elementwise-config.c",
++    "src/src/configs/unpool-config.c",
++    "src/src/configs/vmulcaddc-config.c",
++    "src/src/configs/x8-lut-config.c",
++    "src/src/configs/xx-fill-config.c",
++    "src/src/configs/xx-pad-config.c"
 +    ]
- 
--      sources = [
--        "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" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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-vadd_x64_standalone") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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("enums_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.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) {
--    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",
--      ]
++
 +    configs -= [ "//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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# 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") {
++  source_set("enums_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c"
++      "src/src/enums/allocation-type.c",
++    "src/src/enums/datatype-strings.c",
++    "src/src/enums/microkernel-type.c",
++    "src/src/enums/node-type.c",
++    "src/src/enums/operator-type.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//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",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  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",
--      ]
++
 +    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_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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-avgpool_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81858,109 +86619,28 @@ Index: chromium-152.0.7977.64/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-avgpool/gen/f16-avgpool-9p-minmax-rvvfp16arith-u2v.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# 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-avgpool_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81968,48 +86648,14 @@ Index: chromium-152.0.7977.64/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-avgpool/gen/f16-avgpool-9p-minmax-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("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" ]
--      }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -82021,21 +86667,12 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vaddc_x64") {
--      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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -82043,45 +86680,31 @@ Index: chromium-152.0.7977.64/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-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"
 +    ]
- 
--      configs -= [ "//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-vaddc_x64_standalone") {
--      cflags = []
++
 +# 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-dwconv_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -82089,191 +86712,109 @@ Index: chromium-152.0.7977.64/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-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-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" ]
--      }
--    }
--  }
++
 +    configs -= [ "//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-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",
--      ]
++
 +    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-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" ]
--      }
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  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",
--      ]
++
++if (build_with_chromium) {
++  source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "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" ]
++
++    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_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/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-maxpool_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-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.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-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",
@@ -82282,521 +86823,165 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# 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-f32-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.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-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  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",
--      ]
++
 +    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_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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_riscv64") {
++  source_set("f16-f32acc-rdsum2_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-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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_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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vcvt_x64") {
--      cflags = []
++
 +# 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-f32acc-rdsum2_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-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.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" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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-vcvt_x64_standalone") {
--      cflags = []
++
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_riscv64") {
++  source_set("f16-f32acc-rdsum_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-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.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",
 +    ]
- 
--      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" ]
--      }
--    }
--  }
++
 +# 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-f32acc-rdsum_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-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.c"
 +    ]
- 
--  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",
--      ]
++
 +    configs -= [ "//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-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" ]
--      }
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  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",
--      ]
++
 +if (build_with_chromium) {
-+  source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -82804,48 +86989,14 @@ Index: chromium-152.0.7977.64/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-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-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",
@@ -82854,35 +87005,12 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# 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-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -82890,121 +87018,31 @@ Index: chromium-152.0.7977.64/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-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-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  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",
--      ]
++
 +    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_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" ]
--      }
--    }
++
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -83012,8 +87050,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -83029,15 +87066,12 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    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-rdminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -83045,276 +87079,94 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.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-rdminmax_riscv64") {
++  source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    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-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
++    "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.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-rdminmax_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-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "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-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-rminmax_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -83322,50 +87174,15 @@ Index: chromium-152.0.7977.64/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-igemm/gen/f16-igemm-1x4v-minmax-rvvfp16arith.c",
++    "src/src/f16-igemm/gen/f16-igemm-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-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",
@@ -83374,15 +87191,12 @@ Index: chromium-152.0.7977.64/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-rminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -83390,328 +87204,107 @@ Index: chromium-152.0.7977.64/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-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-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" ]
++    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-rminmax_riscv64") {
++  source_set("f16-maxpool_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-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.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-rminmax_riscv64_standalone") {
++  source_set("f16-maxpool_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-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.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-spmm_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-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.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-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",
@@ -83720,423 +87313,163 @@ Index: chromium-152.0.7977.64/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-spmm_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-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.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-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-qu8-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-u4v.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.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-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-qu8-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-u4v.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.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-vapproxgelu_riscv64") {
++  source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.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") {
++  source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.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") {
++  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -84144,108 +87477,29 @@ Index: chromium-152.0.7977.64/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-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-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-vbinary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -84253,306 +87507,124 @@ Index: chromium-152.0.7977.64/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-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-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-vclamp_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-rdminmax_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.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-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-vclamp_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-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.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("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-vcmul_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//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=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -84560,55 +87632,49 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcmul/gen/f16-vcmul-rvvfp16arith-u2v.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(
--        "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: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") {
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -84617,162 +87683,45 @@ Index: chromium-152.0.7977.64/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("f16-vcmul_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-rminmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcmul/gen/f16-vcmul-rvvfp16arith-u2v.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" ]
--    }
--  }
++
 +    configs -= [ "//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") {
++  source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -84780,56 +87729,28 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-rational-3-2-div-u8v.c"
++      "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.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") {
++  source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -84837,191 +87758,46 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-rational-3-2-div-u8v.c"
++      "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.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") {
++  source_set("f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-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-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",
@@ -85030,334 +87806,103 @@ Index: chromium-152.0.7977.64/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("f16-vcos_riscv64_standalone") {
++  source_set("f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-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-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") {
++  source_set("f16-vapproxgelu_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-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.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") {
++  source_set("f16-vapproxgelu_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-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.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") {
++  source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -85365,116 +87910,46 @@ Index: chromium-152.0.7977.64/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-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("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") {
++  source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -85482,297 +87957,154 @@ Index: chromium-152.0.7977.64/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-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"
 +    ]
- 
--      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") {
++  source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vclamp/gen/f16-vclamp-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" ]
++
++    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-vclamp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vclamp/gen/f16-vclamp-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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/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") {
++    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-vcmul/gen/f16-vcmul-rvvfp16arith-u2v.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") {
++  source_set("f16-vcmul_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-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-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",
@@ -85784,21 +88116,12 @@ Index: chromium-152.0.7977.64/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("f16-vgelu_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vcos_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -85806,44 +88129,28 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-rvvfp16arith-rational-6-4-div-u2v.c"
++      "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-poly-3-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("qu8-gemm_x64_standalone") {
--      cflags = []
++
 +# 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-vcos_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -85851,193 +88158,45 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-rvvfp16arith-rational-6-4-div-u2v.c"
++      "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-poly-3-u4v.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-vgelu_riscv64") {
++  source_set("f16-vcos_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vcos/gen/f16-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-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",
@@ -86046,173 +88205,43 @@ Index: chromium-152.0.7977.64/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-vgelu_riscv64_standalone") {
++  source_set("f16-vcos_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vcos/gen/f16-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-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-vhswish_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-velu_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -86220,90 +88249,28 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c"
++      "src/src/f16-velu/gen/f16-velu-rvvfp16arith-rr1-p3-u2v.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-vhswish_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-velu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -86311,77 +88278,31 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c"
++      "src/src/f16-velu/gen/f16-velu-rvvfp16arith-rr1-p3-u2v.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-vlog_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vexp_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -86389,88 +88310,28 @@ Index: chromium-152.0.7977.64/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-vexp/gen/f16-vexp-rvvfp16arith-poly-3-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-vlog_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vexp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -86478,256 +88339,210 @@ Index: chromium-152.0.7977.64/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-vexp/gen/f16-vexp-rvvfp16arith-poly-3-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-vlog_riscv64") {
++  source_set("f16-vexp_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.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-vlog_riscv64_standalone") {
++  source_set("f16-vexp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/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-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" ]
++
++    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-vgelu_arch=rv64gc_zvfh-abi=lp64d_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/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-vgelu_riscv64") {
++    cflags = [
++  
++    ]
++  
++    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" ]
++
++    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-vgelu_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    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" ]
--    }
--  }
++
 +    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-vlrelu_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -86735,44 +88550,28 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-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-vlrelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -86780,139 +88579,31 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-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-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vlog_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -86920,49 +88611,14 @@ Index: chromium-152.0.7977.64/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-vlog/gen/f16-vlog-rvvfp16arith-rational-1-3-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("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",
@@ -86971,41 +88627,12 @@ Index: chromium-152.0.7977.64/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-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vlog_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87013,275 +88640,90 @@ Index: chromium-152.0.7977.64/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-vlog/gen/f16-vlog-rvvfp16arith-rational-1-3-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(
--        "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-vrnd_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vlog_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-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.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-vrnd_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-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-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.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-vrsqrt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87289,114 +88731,28 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-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" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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-vrsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87404,118 +88760,31 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.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-vsigmoid_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87523,11 +88792,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.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" ]
@@ -87541,12 +88808,12 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87554,125 +88821,31 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c4v-minmax-rvvfp16arith-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" ]
- 
--  # 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",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  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",
--      ]
++
 +    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_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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
-+  source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87680,88 +88853,31 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-rational-3-2-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-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",
--      ]
++
 +    configs -= [ "//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-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qu8-vaddc_x64") {
--      cflags = []
++
 +# 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-vrnd_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87769,23 +88885,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-rational-3-2-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-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",
@@ -87793,30 +88903,67 @@ Index: chromium-152.0.7977.64/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" ]
++    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") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-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",
++    ]
++
++    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) {
--    source_set("qu8-vaddc_x64_standalone") {
--      cflags = []
+-    source_set("qu8-vcvt_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-scalar-u1.c",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -87838,105 +88985,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f16-vsin_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
-+    ]
- 
--  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",
--      ]
 +    configs -= [ "//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-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" ]
--      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
 -  if (build_with_chromium) {
--    source_set("qu8-vcvt_f16c-fma-avx2") {
+-    source_set("qu8-vcvt_ssse3-no-sse4.1") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse4.1",
+-        "-mssse3",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -87950,59 +89013,6 @@ Index: chromium-152.0.7977.64/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-vsin_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-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",
@@ -88010,198 +89020,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "//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("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "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",
-+    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vcvt_sse4.1-no-sse4.2_standalone") {
--      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: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-vcvt_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-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-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" ]
--    }
--  }
-+    configs -= [ "//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) {
@@ -88233,15 +89055,6 @@ Index: chromium-152.0.7977.64/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" ]
      }
@@ -88257,14 +89070,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_riscv64") {
++  source_set("f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88301,14 +89115,15 @@ Index: chromium-152.0.7977.64/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("f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.c"
 +    ]
  
 -      sources = [
@@ -88440,7 +89255,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88448,7 +89263,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-rational-5-4-div-u8v.c"
++      "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-poly-3-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -88527,7 +89342,7 @@ Index: chromium-152.0.7977.64/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("f16-vsin_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88535,7 +89350,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-rational-5-4-div-u8v.c"
++      "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-poly-3-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -88650,14 +89465,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_riscv64") {
++  source_set("f16-vsin_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -88738,14 +89553,14 @@ Index: chromium-152.0.7977.64/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("f16-vsin_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
 +    ]
  
 -      sources = [
@@ -88788,7 +89603,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vlrelu_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88796,9 +89611,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c"
 +    ]
  
 -      sources = [
@@ -88904,7 +89717,7 @@ Index: chromium-152.0.7977.64/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88912,9 +89725,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -89017,15 +89828,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("f16-vsqrt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -89083,15 +89893,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f16-vsqrt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -89134,14 +89943,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vmul_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_riscv64") {
++  source_set("f16-vtanh_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-rational-5-4-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -89247,14 +90057,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_riscv64_standalone") {
++  source_set("f16-vtanh_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-rational-5-4-div-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -89357,15 +90168,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d") {
++  source_set("f16-vtanh_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/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -89423,15 +90233,14 @@ Index: chromium-152.0.7977.64/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("f16-vtanh_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/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -89499,14 +90308,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_riscv64") {
++  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.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) {
@@ -89589,14 +90401,17 @@ Index: chromium-152.0.7977.64/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("f16-vunary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.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 = [
@@ -89664,14 +90479,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_riscv64") {
++  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -89754,14 +90570,15 @@ Index: chromium-152.0.7977.64/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-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
 +    ]
  
 -      sources = [
@@ -89829,15 +90646,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-argmaxpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -89930,15 +90746,14 @@ Index: chromium-152.0.7977.64/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-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-argmaxpool_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -      deps = [
@@ -90007,14 +90822,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/reference/unary-elementwise.cc",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_riscv64") {
++  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90051,14 +90867,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_riscv64_standalone") {
++  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -90187,16 +91004,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-avgpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -90254,16 +91069,14 @@ Index: chromium-152.0.7977.64/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-avgpool_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -90331,21 +91144,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_riscv64") {
++  source_set("f32-bf16-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-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -90426,21 +91232,14 @@ Index: chromium-152.0.7977.64/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-bf16-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-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -90508,7 +91307,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -90516,14 +91315,7 @@ Index: chromium-152.0.7977.64/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-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -90606,7 +91398,7 @@ Index: chromium-152.0.7977.64/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-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -90614,14 +91406,7 @@ Index: chromium-152.0.7977.64/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-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
 +    ]
  
 -      sources = [
@@ -90691,23 +91476,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_riscv64") {
++  source_set("f32-conv-hwc2chw_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-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -90792,23 +91568,14 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("f32-conv-hwc2chw_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-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -      sources = [
@@ -90880,15 +91647,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -90997,15 +91765,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.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" ]
@@ -91126,14 +91895,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_riscv64") {
++  source_set("f32-dwconv2d-chw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-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) {
@@ -91214,14 +91990,21 @@ Index: chromium-152.0.7977.64/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-dwconv2d-chw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-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 = [
@@ -91289,7 +92072,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91297,8 +92080,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -91373,7 +92162,7 @@ Index: chromium-152.0.7977.64/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-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91381,8 +92170,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c"
 +    ]
  
 -      sources = [
@@ -91491,19 +92286,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("tables_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-gemm_riscv64") {
++  source_set("f32-dwconv_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-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-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 = [
@@ -91613,19 +92412,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_riscv64_standalone") {
++  source_set("f32-dwconv_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-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-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) {
@@ -91725,14 +92528,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_riscv64") {
++  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -91786,14 +92590,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear-chw_riscv64_standalone") {
++  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
 +    ]
  
 -      sources = [
@@ -91861,15 +92666,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-f16-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-rvv-u2v.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -91950,15 +92754,14 @@ Index: chromium-152.0.7977.64/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-f16-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-rvv-u2v.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      sources = [
@@ -92026,14 +92829,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_riscv64") {
++  source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -92116,14 +92921,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear_riscv64_standalone") {
++  source_set("f32-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -92193,16 +93000,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
-+    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x4-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) {
@@ -92287,16 +93097,19 @@ Index: chromium-152.0.7977.64/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-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
-+    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x4-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 = [
@@ -92368,19 +93181,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-igemm_riscv64") {
++  source_set("f32-ibilinear-chw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-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-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -92493,19 +93301,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_riscv64_standalone") {
++  source_set("f32-ibilinear-chw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-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-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -  # This is a target that cannot depend on //base.
@@ -92631,7 +93434,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/u8-vclamp/u8-vclamp-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-ibilinear_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -92639,7 +93442,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92676,7 +93479,7 @@ Index: chromium-152.0.7977.64/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-ibilinear_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -92684,7 +93487,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -92795,15 +93598,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("x16-packw_x64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_riscv64") {
++  source_set("f32-ibilinear_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-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",
@@ -92824,20 +93632,15 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
@@ -92848,14 +93651,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_riscv64_standalone") {
++  source_set("f32-ibilinear_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -92987,15 +93790,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_riscv64") {
++  source_set("f32-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -93053,15 +93857,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc4w-gemm_riscv64_standalone") {
++  source_set("f32-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -93104,15 +93909,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("x16-transposec_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_riscv64") {
++  source_set("f32-igemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-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 = [
@@ -93169,15 +93978,19 @@ Index: chromium-152.0.7977.64/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-qc8w-gemm_riscv64_standalone") {
++  source_set("f32-igemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-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"
 +    ]
  
 -      deps = [
@@ -93260,7 +94073,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93268,7 +94081,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -93326,7 +94139,7 @@ Index: chromium-152.0.7977.64/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-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93334,7 +94147,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -93402,15 +94215,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_riscv64") {
++  source_set("f32-maxpool_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -93499,15 +94311,14 @@ Index: chromium-152.0.7977.64/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-qs8-vcvt_riscv64_standalone") {
++  source_set("f32-maxpool_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -93552,15 +94363,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("x32-packw_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-qc4w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -93666,15 +94477,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-qc4w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -93730,15 +94541,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("x32-packw_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_riscv64") {
++  source_set("f32-qc8w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -93852,15 +94663,15 @@ Index: chromium-152.0.7977.64/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-qc8w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-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) {
@@ -93948,7 +94759,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93956,7 +94767,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -93993,7 +94804,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94001,7 +94812,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -94113,14 +94924,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/x32-unpool/x32-unpool-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_riscv64") {
++  source_set("f32-qs8-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94157,14 +94969,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_riscv64_standalone") {
++  source_set("f32-qs8-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.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 = [
@@ -94295,7 +95108,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94303,8 +95116,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -94362,7 +95174,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94370,8 +95182,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -94439,15 +95250,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_riscv64") {
++  source_set("f32-qu8-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -94553,15 +95364,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_riscv64_standalone") {
++  source_set("f32-qu8-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -94688,7 +95499,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94696,7 +95507,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -94791,7 +95602,7 @@ Index: chromium-152.0.7977.64/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-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94799,7 +95610,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
 +    ]
  
 -      sources = [
@@ -94842,14 +95653,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("x8-lut_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_riscv64") {
++  source_set("f32-raddstoreexpminusmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      sources = [
@@ -94905,14 +95716,14 @@ Index: chromium-152.0.7977.64/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-rdsum2_riscv64_standalone") {
++  source_set("f32-raddstoreexpminusmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      deps = [
@@ -94998,7 +95809,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95006,7 +95817,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -95088,7 +95900,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95096,7 +95908,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -95212,14 +96025,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_riscv64") {
++  source_set("f32-rdminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -95229,7 +96043,11 @@ Index: chromium-152.0.7977.64/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",
@@ -95237,55 +96055,52 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_riscv64_standalone") {
++  source_set("f32-rdminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
--      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("x8-transposec_x64_standalone") {
+-      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("x8-transposec_x64_standalone") {
--      cflags = []
++
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
@@ -95325,7 +96140,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/xx-copy/xx-copy-scalar-memcpy.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95333,9 +96148,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -95372,7 +96185,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95380,9 +96193,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -95494,16 +96305,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/xx-fill/xx-fill-scalar-u16.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_riscv64") {
++  source_set("f32-rdsum2_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -95540,16 +96349,14 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("f32-rdsum2_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -95687,7 +96494,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95695,7 +96502,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -95753,7 +96560,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95761,7 +96568,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -95804,14 +96611,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("xx-pad_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_riscv64") {
++  source_set("f32-rdsum_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -95867,14 +96674,14 @@ Index: chromium-152.0.7977.64/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-rsum2_riscv64_standalone") {
++  source_set("f32-rdsum_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      deps = [
@@ -95955,7 +96762,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95963,7 +96770,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.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" ]
@@ -96018,7 +96827,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96026,7 +96835,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c"
++      "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c",
++    "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -96069,14 +96880,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("bf16-qs8-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rsum_riscv64") {
++  source_set("f32-rminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.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 = [
@@ -96132,14 +96945,16 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("f32-rminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
 +    ]
  
 -      deps = [
@@ -96223,7 +97038,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-spmm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96231,9 +97046,7 @@ Index: chromium-152.0.7977.64/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-rsum2/gen/f32-rsum2-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96292,7 +97105,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96300,9 +97113,7 @@ Index: chromium-152.0.7977.64/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-rsum2/gen/f32-rsum2-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -96441,16 +97252,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-spmm_riscv64") {
++  source_set("f32-rsum2_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96508,16 +97317,14 @@ Index: chromium-152.0.7977.64/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-spmm_riscv64_standalone") {
++  source_set("f32-rsum2_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -96560,7 +97367,7 @@ Index: chromium-152.0.7977.64/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-vapproxgelu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96568,7 +97375,7 @@ Index: chromium-152.0.7977.64/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-rsum/gen/f32-rsum-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -96624,7 +97431,7 @@ Index: chromium-152.0.7977.64/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-vapproxgelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96632,7 +97439,7 @@ Index: chromium-152.0.7977.64/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-rsum/gen/f32-rsum-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -96714,14 +97521,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_riscv64") {
++  source_set("f32-rsum_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96778,14 +97585,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_riscv64_standalone") {
++  source_set("f32-rsum_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
@@ -96884,7 +97691,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-spmm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96892,25 +97699,9 @@ Index: chromium-152.0.7977.64/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-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96966,7 +97757,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-spmm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96974,25 +97765,9 @@ Index: chromium-152.0.7977.64/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-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 = [
@@ -97035,32 +97810,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_riscv64") {
++  source_set("f32-spmm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
++      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -97116,32 +97875,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_riscv64_standalone") {
++  source_set("f32-spmm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
++      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
 +    ]
  
 -      deps = [
@@ -97220,7 +97963,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vapproxgelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97228,7 +97971,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -97282,7 +98025,7 @@ Index: chromium-152.0.7977.64/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vapproxgelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97290,7 +98033,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
 -      sources = [
@@ -97358,14 +98101,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_riscv64") {
++  source_set("f32-vapproxgelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -97442,14 +98185,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_riscv64_standalone") {
++  source_set("f32-vapproxgelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -97503,7 +98246,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97511,7 +98254,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
++      "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -97564,7 +98325,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97572,7 +98333,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
++      "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-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 = [
@@ -97615,14 +98394,32 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_riscv64") {
++  source_set("f32-vbinary_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -97678,14 +98475,32 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("f32-vbinary_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
 +    ]
  
 -      deps = [
@@ -97767,7 +98582,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vclamp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97775,9 +98590,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-vclamp/gen/f32-vclamp-rvv-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -97834,7 +98647,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97842,9 +98655,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-vclamp/gen/f32-vclamp-rvv-u8v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -97895,16 +98706,14 @@ Index: chromium-152.0.7977.64/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-vcopysign_riscv64") {
++  source_set("f32-vclamp_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -97957,16 +98766,14 @@ Index: chromium-152.0.7977.64/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-vcopysign_riscv64_standalone") {
++  source_set("f32-vclamp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      sources = [
@@ -98009,7 +98816,7 @@ Index: chromium-152.0.7977.64/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-vcos_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98017,7 +98824,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -98073,7 +98880,7 @@ Index: chromium-152.0.7977.64/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-vcmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98081,7 +98888,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -98160,14 +98967,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcos_riscv64") {
++  source_set("f32-vcmul_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -98221,14 +99028,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcos_riscv64_standalone") {
++  source_set("f32-vcmul_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -98271,7 +99078,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f16-qu8-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-velu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98279,7 +99086,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c"
++      "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 = [
@@ -98335,7 +99144,7 @@ Index: chromium-152.0.7977.64/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-vcopysign_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98343,7 +99152,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c"
++      "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"
 +    ]
  
 -      deps = [
@@ -98423,14 +99234,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-velu_riscv64") {
++  source_set("f32-vcopysign_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -98485,14 +99298,16 @@ Index: chromium-152.0.7977.64/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-vcopysign_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
 +    ]
  
 -      sources = [
@@ -98536,7 +99351,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f16-rdminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vexp_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vcos_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98544,7 +99359,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
++      "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -98603,7 +99418,7 @@ Index: chromium-152.0.7977.64/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-vcos_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98611,7 +99426,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
++      "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
 +    ]
  
 -      deps = [
@@ -98694,14 +99509,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vexp_riscv64") {
++  source_set("f32-vcos_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -98757,14 +99572,14 @@ Index: chromium-152.0.7977.64/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-vcos_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -98807,7 +99622,7 @@ Index: chromium-152.0.7977.64/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-vgelu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-velu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98815,7 +99630,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c"
++      "src/src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c"
 +    ]
  
 -      sources = [
@@ -98871,7 +99686,7 @@ Index: chromium-152.0.7977.64/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-velu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98879,7 +99694,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c"
++      "src/src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c"
 +    ]
  
 -      deps = [
@@ -98947,14 +99762,14 @@ Index: chromium-152.0.7977.64/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-vgelu_riscv64") {
++  source_set("f32-velu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -98991,14 +99806,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_riscv64_standalone") {
++  source_set("f32-velu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      sources = [
@@ -99092,7 +99907,7 @@ Index: chromium-152.0.7977.64/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-vhswish_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vexp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99100,7 +99915,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
++      "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -99177,7 +99992,7 @@ Index: chromium-152.0.7977.64/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-vexp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99185,7 +100000,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
++      "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
 +    ]
  
 -      deps = [
@@ -99264,14 +100079,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_riscv64") {
++  source_set("f32-vexp_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -99325,19 +100140,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_riscv64_standalone") {
++  source_set("f32-vexp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c",
+-        "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-poly-3.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -99375,7 +100190,7 @@ Index: chromium-152.0.7977.64/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-vlog_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vgelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99383,12 +100198,12 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c",
+-        "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -99427,7 +100242,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-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",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -99439,7 +100255,7 @@ Index: chromium-152.0.7977.64/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-vgelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99447,7 +100263,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
 -      deps = [
@@ -99479,7 +100295,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-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" ]
@@ -99526,14 +100343,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlog_riscv64") {
++  source_set("f32-vgelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -99587,14 +100404,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_riscv64_standalone") {
++  source_set("f32-vgelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -99637,7 +100454,7 @@ Index: chromium-152.0.7977.64/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-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99645,7 +100462,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -99702,7 +100519,7 @@ Index: chromium-152.0.7977.64/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-vhswish_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99710,7 +100527,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -99790,14 +100607,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_riscv64") {
++  source_set("f32-vhswish_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -99851,14 +100668,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_riscv64_standalone") {
++  source_set("f32-vhswish_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
  
 -      sources = [
@@ -99901,7 +100718,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vgelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vlog_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99909,7 +100726,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
++      "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -99965,7 +100782,7 @@ Index: chromium-152.0.7977.64/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-vlog_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99973,7 +100790,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
++      "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c"
 +    ]
  
 -      deps = [
@@ -100052,14 +100869,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_riscv64") {
++  source_set("f32-vlog_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -100113,14 +100930,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vmulcaddc_riscv64_standalone") {
++  source_set("f32-vlog_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
  
 -      sources = [
@@ -100164,7 +100981,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vlog_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100172,10 +100989,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -100232,7 +101046,7 @@ Index: chromium-152.0.7977.64/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-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100240,10 +101054,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -100310,17 +101121,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_riscv64") {
++  source_set("f32-vlrelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -100357,17 +101165,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_riscv64_standalone") {
++  source_set("f32-vlrelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -100442,7 +101247,7 @@ Index: chromium-152.0.7977.64/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-vrsqrt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vmulcaddc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100450,7 +101255,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
 +    ]
  
 -      sources = [
@@ -100509,7 +101314,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vmulcaddc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100517,7 +101322,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
 +    ]
  
 -      deps = [
@@ -100597,15 +101402,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_riscv64") {
++  source_set("f32-vmulcaddc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -100660,20 +101464,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_riscv64_standalone") {
++  source_set("f32-vmulcaddc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c",
+-        "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-poly-3.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -100711,7 +101514,7 @@ Index: chromium-152.0.7977.64/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-vsigmoid_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100719,12 +101522,15 @@ Index: chromium-152.0.7977.64/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-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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c",
+-        "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -100763,7 +101569,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f16-vsin/gen/f16-f32acc-vsin-neonfp16-poly-3.c",
+-        "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -100775,7 +101582,7 @@ Index: chromium-152.0.7977.64/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-vsigmoid_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100783,7 +101590,10 @@ Index: chromium-152.0.7977.64/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-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"
 +    ]
  
 -      deps = [
@@ -100815,7 +101625,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f16-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" ]
@@ -100863,14 +101674,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_riscv64") {
++  source_set("f32-vrnd_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -100925,14 +101739,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_riscv64_standalone") {
++  source_set("f32-vrnd_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-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 = [
@@ -100975,7 +101792,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vsqrt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsin_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100983,7 +101800,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
 +    ]
  
 -      sources = [
@@ -101009,37 +101826,28 @@ Index: chromium-152.0.7977.64/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" ]
-+  }
+   }
 +}
  
--      configs -= [ "//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" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -101047,23 +101855,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
 +    ]
  
--      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",
 -      ]
 +    configs -= [ "//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",
@@ -101071,11 +101878,36 @@ Index: chromium-152.0.7977.64/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" ]
-+    public_configs = [ ":xnnpack_public_config" ]
++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"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -101099,61 +101931,89 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-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",
 -      ]
-+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"
-+    ]
++    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-vtanh_arm64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  source_set("f32-vsigmoid_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -101180,6 +102040,18 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
@@ -101189,14 +102061,15 @@ Index: chromium-152.0.7977.64/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-vsin_riscv64_standalone") {
++  source_set("f32-vsigmoid_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-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -101241,15 +102114,14 @@ Index: chromium-152.0.7977.64/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-vsqrt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vsigmoid_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-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
  
 -      sources = [
@@ -101277,62 +102149,51 @@ Index: chromium-152.0.7977.64/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" ]
-+  }
+   }
 +}
  
--      configs -= [ "//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 = []
 +# 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-vsigmoid_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-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
  
--      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",
 -      ]
 +    configs -= [ "//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",
@@ -101340,11 +102201,36 @@ Index: chromium-152.0.7977.64/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 = []
-+    public_configs = [ ":xnnpack_public_config" ]
++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"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -101369,61 +102255,88 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("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",
 -      ]
-+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" ]
  
 -      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-avgpool_arm64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++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"
 +    ]
  
 -      sources = [
@@ -101450,6 +102363,18 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
@@ -101459,14 +102384,14 @@ Index: chromium-152.0.7977.64/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-vsqrt_riscv64_standalone") {
++  source_set("f32-vsin_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -101509,7 +102434,7 @@ Index: chromium-152.0.7977.64/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-vtanh_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -101517,7 +102442,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c"
 +    ]
  
 -      sources = [
@@ -101543,38 +102468,28 @@ Index: chromium-152.0.7977.64/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" ]
-+  }
+   }
 +}
  
--      configs -= [ "//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 = []
 +# 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("f32-vsqrt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -101582,23 +102497,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c"
 +    ]
  
--      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",
 -      ]
 +    configs -= [ "//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",
@@ -101606,11 +102521,35 @@ Index: chromium-152.0.7977.64/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 = []
-+    public_configs = [ ":xnnpack_public_config" ]
++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"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -101635,62 +102574,89 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("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",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-vtanh_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.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-conv-hwc2chw_arm64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++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"
 +    ]
  
 -      sources = [
@@ -101718,6 +102684,18 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
@@ -101727,14 +102705,15 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("f32-vtanh_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -101836,17 +102815,14 @@ Index: chromium-152.0.7977.64/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-vunary_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vtanh_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/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      asmflags = cflags
@@ -101882,17 +102858,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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("f32-vtanh_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/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -101983,16 +102956,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vunary_riscv64") {
++  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-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -102063,16 +103037,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_riscv64_standalone") {
++  source_set("f32-vunary_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/f32-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 = [
@@ -102117,36 +103092,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-f16-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("operators_riscv64") {
++  source_set("f32-vunary_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"
++      "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 = [
@@ -102233,36 +103188,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("operators_riscv64_standalone") {
++  source_set("f32-vunary_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/operators/argmax-pooling-nhwc.c",
-+    "src/src/operators/average-pooling-nhwc.c",
-+    "src/src/operators/batch-matrix-multiply-nc.c",
-+    "src/src/operators/binary-elementwise-nd.c",
-+    "src/src/operators/constant-pad-nd.c",
-+    "src/src/operators/convolution-nchw.c",
-+    "src/src/operators/convolution-nhwc.c",
-+    "src/src/operators/deconvolution-nhwc.c",
-+    "src/src/operators/dynamic-fully-connected-nc.c",
-+    "src/src/operators/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/f32-vunary/gen/f32-vabs-scalar.c",
++    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
++    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -102372,15 +103307,36 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-bf16-qb4w-gemm_riscv64") {
++  source_set("operators_riscv64") {
 +    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"
++      "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" ]
@@ -102450,15 +103406,36 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# 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("operators_riscv64_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"
++      "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 = [
@@ -102503,14 +103480,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-ibilinear-chw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_riscv64") {
++  source_set("qd8-bf16-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-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"
 +    ]
  
 -      sources = [
@@ -102570,14 +103548,15 @@ Index: chromium-152.0.7977.64/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-qc2w-gemm_riscv64_standalone") {
++  source_set("qd8-bf16-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-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"
 +    ]
  
 -      deps = [
@@ -102641,16 +103620,14 @@ Index: chromium-152.0.7977.64/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-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("qd8-f16-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-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      asmflags = cflags
@@ -102713,16 +103690,14 @@ Index: chromium-152.0.7977.64/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-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("qd8-f16-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-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -102827,7 +103802,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-igemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -102835,8 +103810,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-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 = [
@@ -102909,7 +103884,7 @@ Index: chromium-152.0.7977.64/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-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -102917,8 +103892,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-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"
 +    ]
  
 -      deps = [
@@ -103004,7 +103979,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -103012,8 +103987,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -103075,7 +104050,7 @@ Index: chromium-152.0.7977.64/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-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -103083,8 +104058,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    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-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 = [
@@ -103129,23 +104104,31 @@ Index: chromium-152.0.7977.64/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-f32-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-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-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"
 +    ]
- 
--      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/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-asm-aarch64-neonfma-ld128-acc4.S",
@@ -103171,13 +104154,6 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
@@ -103187,15 +104163,16 @@ Index: chromium-152.0.7977.64/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-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    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-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 = [
@@ -103297,14 +104274,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_riscv64") {
++  source_set("qd8-f32-qb4w-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-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -103361,14 +104339,15 @@ Index: chromium-152.0.7977.64/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-qb4w-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-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 = [
@@ -103452,16 +104431,14 @@ Index: chromium-152.0.7977.64/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-qc4w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc2w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -103498,16 +104475,14 @@ Index: chromium-152.0.7977.64/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc2w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -103583,15 +104558,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-rdminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_riscv64") {
++  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -103651,15 +104627,16 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      deps = [
@@ -103728,16 +104705,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc4w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -103774,16 +104750,15 @@ Index: chromium-152.0.7977.64/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-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc4w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -103861,16 +104836,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-rminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_riscv64") {
++  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -103932,16 +104907,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_riscv64_standalone") {
++  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      deps = [
@@ -104010,16 +104985,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc8w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -104056,16 +105031,16 @@ Index: chromium-152.0.7977.64/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-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc8w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -104144,16 +105119,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-spmm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_riscv64") {
++  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -104216,16 +105191,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_riscv64_standalone") {
++  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      deps = [
@@ -104342,16 +105317,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc8w-igemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -104442,16 +105417,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc8w-igemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -104495,17 +105470,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vclamp_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_riscv64") {
++  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -104553,17 +105527,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_riscv64_standalone") {
++  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -104607,15 +105580,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vcmul_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-dwconv_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
++      "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 = [
@@ -104663,15 +105638,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-dwconv_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -104759,14 +105736,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_riscv64") {
++  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -104803,14 +105781,15 @@ Index: chromium-152.0.7977.64/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-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -104886,20 +105865,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-velu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-packw_riscv64") {
++  source_set("qs8-f32-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-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-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -104949,20 +105922,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_riscv64_standalone") {
++  source_set("qs8-f32-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-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-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -105006,17 +105973,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vexp_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_riscv64") {
++  source_set("qs8-packw_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"
++      "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 = [
@@ -105064,17 +106034,20 @@ Index: chromium-152.0.7977.64/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-packw_riscv64_standalone") {
 +    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"
++      "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 = [
@@ -105118,15 +106091,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vgelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_riscv64") {
++  source_set("qs8-qc2w-gemm_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-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 = [
@@ -105174,15 +106149,17 @@ Index: chromium-152.0.7977.64/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-qc2w-gemm_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-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 = [
@@ -105226,15 +106203,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vhswish_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-packw_riscv64") {
++  source_set("qs8-qc4w-gemm_riscv64") {
 +    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"
++      "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 = [
@@ -105282,15 +106259,15 @@ Index: chromium-152.0.7977.64/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-packw_riscv64_standalone") {
++  source_set("qs8-qc4w-gemm_riscv64_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"
++      "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 = [
@@ -105334,17 +106311,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vlog_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc4w-packw_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qs8-qc4w-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 = [
@@ -105392,17 +106367,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc4w-packw_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qs8-qc4w-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 = [
@@ -105446,19 +106419,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vlrelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_riscv64") {
++  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -105517,19 +106488,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_riscv64_standalone") {
++  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -105621,16 +106590,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc8w-dwconv_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -105695,16 +106667,19 @@ Index: chromium-152.0.7977.64/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc8w-dwconv_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -105749,15 +106724,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vrsqrt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_riscv64") {
++  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -105817,15 +106793,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_riscv64_standalone") {
++  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -105907,16 +106884,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc8w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -105971,16 +106947,15 @@ Index: chromium-152.0.7977.64/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc8w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -106024,15 +106999,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vsqrt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_riscv64") {
++  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -106090,15 +107066,16 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -106183,15 +107160,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_riscv64") {
++  source_set("qs8-qc8w-igemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -106250,15 +107227,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qu8-packw_riscv64_standalone") {
++  source_set("qs8-qc8w-igemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -106392,15 +107369,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qu8-packw_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -106455,15 +107432,15 @@ Index: chromium-152.0.7977.64/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-qu8-packw_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
  
 -      sources = [
@@ -106561,14 +107538,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_riscv64") {
++  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -106625,14 +107603,15 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -106676,15 +107655,14 @@ Index: chromium-152.0.7977.64/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-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-rdsum_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      sources = [
@@ -106742,15 +107720,14 @@ Index: chromium-152.0.7977.64/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-rdsum_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      deps = [
@@ -106832,14 +107809,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_riscv64") {
++  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -106895,14 +107873,15 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -106946,15 +107925,14 @@ Index: chromium-152.0.7977.64/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-vadd_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -107012,15 +107990,14 @@ Index: chromium-152.0.7977.64/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -107101,15 +108078,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_riscv64") {
++  source_set("qs8-vadd_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-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107164,15 +108141,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_riscv64_standalone") {
++  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -107216,15 +108193,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-bf16-qb4w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vadd_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -107282,15 +108259,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vadd_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -107371,15 +108348,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_riscv64") {
++  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107434,15 +108411,15 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -107486,15 +108463,15 @@ Index: chromium-152.0.7977.64/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-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vaddc_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -107553,15 +108530,15 @@ Index: chromium-152.0.7977.64/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vaddc_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-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -107642,14 +108619,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_riscv64") {
++  source_set("qs8-vcvt_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-vcvt/gen/qs8-vcvt-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107703,14 +108681,15 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("qs8-vcvt_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-vcvt/gen/qs8-vcvt-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -107754,15 +108733,14 @@ Index: chromium-152.0.7977.64/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-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -107820,15 +108798,14 @@ Index: chromium-152.0.7977.64/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -107897,14 +108874,15 @@ Index: chromium-152.0.7977.64/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_riscv64") {
++  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -107941,14 +108919,15 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -108024,15 +109003,14 @@ Index: chromium-152.0.7977.64/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-vmul_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vlrelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
@@ -108092,15 +109070,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vlrelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      deps = [
@@ -108163,14 +109140,15 @@ Index: chromium-152.0.7977.64/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_riscv64") {
++  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      asmflags = cflags
@@ -108207,14 +109185,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_riscv64_standalone") {
++  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -108278,15 +109257,14 @@ Index: chromium-152.0.7977.64/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-vmulc_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vmul_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -108323,15 +109301,14 @@ Index: chromium-152.0.7977.64/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-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vmul_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -108407,14 +109384,15 @@ Index: chromium-152.0.7977.64/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_riscv64") {
++  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -108474,14 +109452,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_riscv64_standalone") {
++  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -108544,14 +109523,14 @@ Index: chromium-152.0.7977.64/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-vprelu_riscv64") {
++  source_set("qs8-vmulc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      asmflags = cflags
@@ -108588,14 +109567,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vprelu_riscv64_standalone") {
++  source_set("qs8-vmulc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -108671,14 +109650,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_riscv64") {
++  source_set("qs8-vprelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -108733,14 +109712,14 @@ Index: chromium-152.0.7977.64/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-vpreluc_riscv64_standalone") {
++  source_set("qs8-vprelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -108784,14 +109763,14 @@ Index: chromium-152.0.7977.64/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-vrpreluc_riscv64") {
++  source_set("qs8-vpreluc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -108849,14 +109828,14 @@ Index: chromium-152.0.7977.64/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-vrpreluc_riscv64_standalone") {
++  source_set("qs8-vpreluc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      deps = [
@@ -108939,16 +109918,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vrpreluc_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/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -109005,16 +109982,14 @@ Index: chromium-152.0.7977.64/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-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vrpreluc_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/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -109059,17 +110034,16 @@ Index: chromium-152.0.7977.64/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_riscv64") {
++  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-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-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -109118,17 +110092,16 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-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-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -109171,15 +110144,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc2w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-dwconv_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-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 = [
@@ -109236,15 +110211,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-dwconv_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-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 = [
@@ -109313,14 +110290,15 @@ Index: chromium-152.0.7977.64/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_riscv64") {
++  source_set("qu8-f32-vcvt_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-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109357,14 +110335,15 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -109440,16 +110419,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc4w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-f32-vcvt_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-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -109499,16 +110476,14 @@ Index: chromium-152.0.7977.64/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-gemm_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-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -109586,15 +110561,16 @@ Index: chromium-152.0.7977.64/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_riscv64") {
++  source_set("qu8-gemm_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-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      asmflags = cflags
@@ -109631,15 +110607,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_riscv64_standalone") {
++  source_set("qu8-gemm_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-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -109703,16 +110680,15 @@ Index: chromium-152.0.7977.64/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-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-gemm_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-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" ]
@@ -109749,16 +110725,15 @@ Index: chromium-152.0.7977.64/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-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-gemm_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-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -109837,15 +110812,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_riscv64") {
++  source_set("qu8-igemm_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-igemm/gen/qu8-igemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -109898,15 +110874,16 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("qu8-igemm_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-igemm/gen/qu8-igemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -109984,15 +110961,15 @@ Index: chromium-152.0.7977.64/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-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-igemm_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-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
@@ -110029,15 +111006,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-igemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -110101,14 +111078,15 @@ Index: chromium-152.0.7977.64/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_riscv64") {
++  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110145,14 +111123,15 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -110233,15 +111212,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-igemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-rdsum_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -      sources = [
@@ -110307,15 +111285,14 @@ Index: chromium-152.0.7977.64/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-rdsum_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -      deps = [
@@ -110396,14 +111373,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_riscv64") {
++  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -110457,14 +111435,15 @@ Index: chromium-152.0.7977.64/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-rsum_riscv64_standalone") {
++  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -110509,15 +111488,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-rsum_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -110575,15 +111553,14 @@ Index: chromium-152.0.7977.64/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-rsum_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -110665,15 +111642,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_riscv64") {
++  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -110730,15 +111707,15 @@ Index: chromium-152.0.7977.64/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-vadd_riscv64_standalone") {
++  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -110783,15 +111760,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vadd_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -110849,15 +111826,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vadd_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -110918,7 +111895,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  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") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme.c",
@@ -110938,36 +111926,40 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+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"
-+    ]
- 
--      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+sve+sve2_standalone") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-      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("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"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -110995,24 +111987,20 @@ Index: chromium-152.0.7977.64/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("qs8-dwconv_arm64") {
 -      cflags = []
-+# 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"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -      sources = [
@@ -111037,26 +112025,30 @@ Index: chromium-152.0.7977.64/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("qs8-dwconv_arm64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++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"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -111086,110 +112078,42 @@ Index: chromium-152.0.7977.64/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("qs8-f16-vcvt_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-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("qu8-vcvt_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-rvv-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-f16-vcvt_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/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-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-f32-vcvt_arm64") {
--      cflags = []
+-    source_set("qs8-f16-vcvt_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("qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vaddc_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-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/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
+-        "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -111224,23 +112148,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-f32-vcvt_arm64_standalone") {
--      cflags = []
+-    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_riscv64") {
++  source_set("qu8-vcvt_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-vcvt/gen/qu8-vcvt-rvv-u4v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
+-        "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111268,8 +112192,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-packw_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qs8-f32-vcvt_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -111279,8 +112203,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-packw/gen/qs8-packw-x16c4-gemm-goi-neondot.c",
--        "src/src/qs8-packw/gen/qs8-packw-x8c4-gemm-goi-neondot.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -111292,14 +112216,15 @@ Index: chromium-152.0.7977.64/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_riscv64_standalone") {
++  source_set("qu8-vcvt_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-vcvt/gen/qu8-vcvt-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -111325,14 +112250,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-packw_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qs8-f32-vcvt_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-packw/gen/qs8-packw-x16c4-gemm-goi-neondot.c",
--        "src/src/qs8-packw/gen/qs8-packw-x8c4-gemm-goi-neondot.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111359,55 +112284,40 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-packw_arm64") {
--      cflags = []
+-    source_set("qs8-packw_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 -
 -      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",
+-        "src/src/qs8-packw/gen/qs8-packw-x16c4-gemm-goi-neondot.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x8c4-gemm-goi-neondot.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
--      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("qs8-packw_arm64_standalone") {
--      cflags = []
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -111415,15 +112325,32 @@ Index: chromium-152.0.7977.64/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("qs8-packw_arch=armv8.2-a+dotprod_standalone") {
+-      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") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.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",
+-        "src/src/qs8-packw/gen/qs8-packw-x16c4-gemm-goi-neondot.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x8c4-gemm-goi-neondot.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111444,40 +112371,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c4-minmax-fp32-neondot.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-8x8c4-minmax-fp32-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("qs8-packw_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -111485,6 +112387,22 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      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",
@@ -111502,23 +112420,29 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qs8-packw_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_riscv64") {
++  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c4-minmax-fp32-neondot.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-8x8c4-minmax-fp32-neondot.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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111539,50 +112463,48 @@ Index: chromium-152.0.7977.64/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("qs8-qc2w-gemm_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    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-1x8c4-minmax-fp32-neondot.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-8x8c4-minmax-fp32-neondot.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-qc2w-gemm_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("qu8-vlrelu_riscv64_standalone") {
++  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/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",
@@ -111606,16 +112528,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc2w-gemm_arm64_standalone") {
--      cflags = []
+-    source_set("qs8-qc2w-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/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-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c4-minmax-fp32-neondot.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-8x8c4-minmax-fp32-neondot.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111642,31 +112562,51 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-    source_set("qs8-qc2w-gemm_arm64") {
+-      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("qu8-vmul_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vlrelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
--      asmflags = 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" ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
--      ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc2w-gemm_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -111674,23 +112614,97 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "//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_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-
+-      asmflags = cflags
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-vlrelu_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x16-minmax-fp32-asm-aarch64-neondot-ld128.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:pthreadpool_standalone",
++    ]
+ 
 -      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-vmul_arch=rv64gcv-abi=lp64d_standalone") {
++    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_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-
+-      asmflags = cflags
++if (build_with_chromium) {
++  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -111701,7 +112715,29 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x16-minmax-fp32-asm-aarch64-neondot-ld128.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:pthreadpool_standalone",
+-      ]
+-
 -      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 -    }
 -  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111709,10 +112745,56 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-  if (build_with_chromium) {
+-    source_set("qs8-qc4w-gemm_arm64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      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",
+-      ]
++    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-vmul_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.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",
@@ -111720,13 +112802,16 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      asmflags = cflags
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc4w-gemm_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
+-        "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" ]
@@ -111753,13 +112838,13 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-qc4w-gemm_arm64") {
+-    source_set("qs8-qc4w-packw_arm64") {
 -      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-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",
 -      ]
 +if (build_with_chromium) {
 +  source_set("qu8-vmul_riscv64") {
@@ -111802,7 +112887,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc4w-gemm_arm64_standalone") {
+-    source_set("qs8-qc4w-packw_arm64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -111818,8 +112903,8 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -      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-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" ]
@@ -112097,13 +113182,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
- 
--      asmflags = cflags
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      asmflags = cflags
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
@@ -112136,13 +113228,6 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
@@ -114407,20 +115492,13 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/u8-ibilinear/gen/u8-ibilinear-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",
@@ -114447,6 +115525,13 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
@@ -119099,6 +120184,11 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    "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" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -119139,20 +120229,15 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
@@ -120361,7 +121446,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
 +    ]
  
 -      sources = [
@@ -120471,7 +121556,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -121059,7 +122144,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -121203,7 +122288,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -121337,7 +122422,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-rational-3-2-div-u8v.c",
+-        "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-poly-3-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -121376,7 +122461,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-rational-3-2-div-u8v.c",
+-        "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-poly-3-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -121418,7 +122503,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c",
+-        "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" ]
@@ -121468,7 +122553,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c",
+-        "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -122115,17 +123200,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vlog_riscv64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c",
@@ -122150,10 +123225,16 @@ Index: chromium-152.0.7977.64/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("f32-conv-hwc2chw_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d") {
@@ -122178,6 +123259,14 @@ Index: chromium-152.0.7977.64/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",
@@ -122185,12 +123274,6 @@ Index: chromium-152.0.7977.64/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-vlrelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -122222,18 +123305,9 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d") {
@@ -122258,20 +123332,25 @@ Index: chromium-152.0.7977.64/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("f32-conv-hwc2chw_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.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) {
@@ -122303,13 +123382,14 @@ Index: chromium-152.0.7977.64/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" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d") {
@@ -122337,31 +123417,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_ppc64") {
-+    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"
-+    ]
++    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) {
@@ -122397,16 +123460,24 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
+-  }
++if (build_with_chromium) {
++  source_set("f32-dwconv2d-chw_ppc64") {
++    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"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d") {
@@ -122431,33 +123502,21 @@ Index: chromium-152.0.7977.64/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("f32-dwconv2d-chw_ppc64_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"
-+    ]
- 
--      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-vrsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -122489,13 +123548,9 @@ Index: chromium-152.0.7977.64/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("f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d") {
@@ -122520,14 +123575,28 @@ Index: chromium-152.0.7977.64/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-dwconv2d-chw_ppc64_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"
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -122561,25 +123630,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-dwconv_ppc64") {
-+    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"
-+    ]
++    configs -= [ "//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-vsin_arch=rv64gc_zvfh-abi=lp64d") {
@@ -122590,7 +123644,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-rational-3-2-div-u8v.c",
+-        "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-poly-3-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -122604,21 +123658,18 @@ Index: chromium-152.0.7977.64/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-vsin_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -122629,7 +123680,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-rational-3-2-div-u8v.c",
+-        "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-poly-3-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -122649,17 +123700,22 @@ Index: chromium-152.0.7977.64/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-vsin_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-dwconv_ppc64") {
 +    cflags = [
 +  
 +    ]
@@ -122678,25 +123734,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-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",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -122704,12 +123749,16 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
  
@@ -122717,10 +123766,30 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vsin_riscv64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-dwconv_ppc64_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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -122742,16 +123811,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "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" ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d") {
@@ -122776,21 +123839,18 @@ Index: chromium-152.0.7977.64/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-vsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -122821,17 +123881,22 @@ Index: chromium-152.0.7977.64/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-vsqrt_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-f16-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
@@ -122841,25 +123906,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-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" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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",
@@ -122867,12 +123921,16 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
  
@@ -122880,7 +123938,18 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vsqrt_riscv64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-f16-vcvt_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
@@ -122905,21 +123974,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-gemm_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-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"
-+    ]
++    configs -= [ "//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=rv64gc_zvfh-abi=lp64d") {
@@ -122944,21 +124002,18 @@ Index: chromium-152.0.7977.64/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-vtanh_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -122989,17 +124044,22 @@ Index: chromium-152.0.7977.64/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-vtanh_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
@@ -123014,25 +124074,14 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "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",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -123040,12 +124089,16 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
  
@@ -123053,15 +124106,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vtanh_riscv64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-gemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.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 = [
@@ -123122,14 +124181,13 @@ Index: chromium-152.0.7977.64/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) {
@@ -123163,19 +124221,11 @@ Index: chromium-152.0.7977.64/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-ibilinear-chw_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
@@ -123200,20 +124250,24 @@ Index: chromium-152.0.7977.64/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("f32-ibilinear-chw_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.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) {
@@ -123245,58 +124299,65 @@ Index: chromium-152.0.7977.64/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("f32-argmaxpool_riscv64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f32-ibilinear_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-ibilinear-chw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "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" ]
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
+-      ]
 +    configs -= [ "//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" ]
+     }
    }
 +}
  
@@ -123304,18 +124365,7 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-argmaxpool_riscv64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
@@ -123340,10 +124390,16 @@ Index: chromium-152.0.7977.64/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("f32-ibilinear_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-avgpool_arch=rv64gcv-abi=lp64d") {
@@ -123368,18 +124424,21 @@ Index: chromium-152.0.7977.64/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("f32-avgpool_arch=rv64gcv-abi=lp64d_standalone") {
@@ -123410,9 +124469,8 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
  
@@ -123429,48 +124487,45 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+if (build_with_chromium) {
-+  source_set("f32-igemm_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-ibilinear_ppc64_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"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.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-avgpool_riscv64_standalone") {
--      cflags = []
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-avgpool_riscv64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
@@ -123493,14 +124548,68 @@ Index: chromium-152.0.7977.64/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("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("f32-igemm_ppc64") {
++    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"
++    ]
+ 
+-      configs -= [ "//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-bf16-vcvt_riscv64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-igemm_ppc64_standalone") {
@@ -123522,15 +124631,54 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "src/include/xnnpack.h",
 -        "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" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-  if (build_with_chromium) {
+-    source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c",
+-      ]
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//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",
@@ -123538,29 +124686,113 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "//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-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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" ]
      }
    }
 +}
  
+-  if (build_with_chromium) {
+-    source_set("f32-conv-hwc2chw_riscv64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-maxpool_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-maxpool/gen/f32-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",
+-      ]
++    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-bf16-vcvt_riscv64_standalone") {
+-    source_set("f32-conv-hwc2chw_riscv64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-maxpool_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++    ]
+ 
 -      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-scalar-1x1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -123582,19 +124814,13 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-maxpool_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-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" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -123602,7 +124828,8 @@ Index: chromium-152.0.7977.64/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-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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -123616,24 +124843,21 @@ Index: chromium-152.0.7977.64/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("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -123641,7 +124865,8 @@ Index: chromium-152.0.7977.64/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-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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -123661,90 +124886,15 @@ Index: chromium-152.0.7977.64/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("f32-conv-hwc2chw_riscv64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "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" ]
- 
--      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-conv-hwc2chw_riscv64_standalone") {
+-  if (build_with_chromium) {
+-    source_set("f32-dwconv2d-chw_riscv64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "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-qc4w-gemm_ppc64") {
 +    cflags = [
@@ -123756,86 +124906,12 @@ Index: chromium-152.0.7977.64/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"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gcv",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//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-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gcv",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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-dwconv2d-chw_riscv64") {
--      cflags = []
--
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
@@ -123859,10 +124935,23 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//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-dwconv2d-chw_riscv64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qc4w-gemm_ppc64_standalone") {
@@ -123876,15 +124965,6 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-dwconv2d-chw_riscv64_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" ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
@@ -123916,12 +124996,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") {
@@ -123953,14 +125031,17 @@ Index: chromium-152.0.7977.64/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) {
@@ -123999,8 +125080,15 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-dwconv_riscv64") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-qc8w-gemm_ppc64") {
 +    cflags = [
@@ -124013,14 +125101,6 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("f32-dwconv_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" ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
@@ -124046,15 +125126,20 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
@@ -129250,6 +130335,11 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    "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" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -129270,20 +130360,15 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
@@ -132238,32 +133323,60 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gcv",
--      ]
+-    source_set("qs8-qc4w-packw_riscv64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c",
+-        "src/src/qs8-qc4w-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",
 -      ]
--
++if (build_with_chromium) {
++  source_set("qs8-rdsum_ppc64") {
++    cflags = [
++  
++    ]
++  
++    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" ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//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-rdsum_ppc64") {
++    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_riscv64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-rdsum_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
@@ -132273,7 +133386,29 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.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" ]
@@ -132281,6 +133416,43 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-  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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
@@ -132313,31 +133485,24 @@ Index: chromium-152.0.7977.64/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("qs8-qc8w-dwconv_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_ppc64_standalone") {
++if (build_with_chromium) {
++  source_set("qs8-rsum_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -132368,19 +133533,32 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
  
 -      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" ]
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-qc8w-dwconv_riscv64_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-rsum_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -132409,11 +133587,12 @@ Index: chromium-152.0.7977.64/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("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
@@ -132439,24 +133618,17 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qs8-rsum_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -      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) {
@@ -132489,53 +133661,41 @@ Index: chromium-152.0.7977.64/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("qs8-qc8w-gemm_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_ppc64_standalone") {
+-
+-      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",
+-      ]
++if (build_with_chromium) {
++  source_set("qs8-vadd_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.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",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -132543,12 +133703,16 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}
  
@@ -132556,7 +133720,19 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-qc8w-gemm_riscv64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-vadd_ppc64_standalone") {
++    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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
@@ -132582,17 +133758,10 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("qs8-vadd_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
@@ -132618,21 +133787,18 @@ Index: chromium-152.0.7977.64/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("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
@@ -132664,67 +133830,33 @@ Index: chromium-152.0.7977.64/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("qs8-qc8w-igemm_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_ppc64_standalone") {
-+    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"
-+    ]
- 
+-
 -      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_riscv64_standalone") {
--      cflags = []
 +if (build_with_chromium) {
 +  source_set("qs8-vaddc_ppc64") {
 +    cflags = [
@@ -132737,6 +133869,25 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    "src/src/qs8-vaddc/gen/qs8-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" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-igemm_riscv64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
@@ -132761,35 +133912,13 @@ Index: chromium-152.0.7977.64/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("qs8-qu8-packw_riscv64") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      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",
--      ]
-+    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_ppc64_standalone") {
@@ -132803,20 +133932,20 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 +    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-      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" ]
  
--      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",
@@ -132824,12 +133953,26 @@ Index: chromium-152.0.7977.64/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("qs8-qu8-packw_riscv64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
@@ -132853,11 +133996,18 @@ Index: chromium-152.0.7977.64/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("qs8-vcvt_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") {
@@ -132882,25 +134032,21 @@ Index: chromium-152.0.7977.64/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qs8-vcvt_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-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" ]
  
+-      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_arch=rv64gcv-abi=lp64d_standalone") {
@@ -132932,13 +134078,6 @@ Index: chromium-152.0.7977.64/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" ]
    }
 +}

diff --git a/HACK-debian-clang-disable-pa-musttail.patch b/HACK-debian-clang-disable-pa-musttail.patch
index d06c52e..dfaa95c 100644
--- a/HACK-debian-clang-disable-pa-musttail.patch
+++ b/HACK-debian-clang-disable-pa-musttail.patch
@@ -1,13 +1,13 @@
-Index: chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
+Index: chromium-153.0.8010.36/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
 ===================================================================
---- chromium-144.0.7559.59.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
-+++ chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
-@@ -139,7 +139,7 @@
+--- chromium-153.0.8010.36.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
++++ chromium-153.0.8010.36/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
+@@ -153,7 +153,7 @@
  //     PA_MUSTTAIL return Func1(d + 1);  // `Func1()` will be tail-called.
  //   }
  // ```
--#if PA_HAS_CPP_ATTRIBUTE(clang::musttail)
-+#if PA_HAS_CPP_ATTRIBUTE(clang::musttail) && !defined(__powerpc64__)
+-#if __has_cpp_attribute(clang::musttail)
++#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc64__)
  #define PA_MUSTTAIL [[clang::musttail]]
  #else
  #define PA_MUSTTAIL

diff --git a/chromium-143-el9-rust-no-alloc-shim-is-unstable.patch b/chromium-143-el9-rust-no-alloc-shim-is-unstable.patch
deleted file mode 100644
index 4154fb0..0000000
--- a/chromium-143-el9-rust-no-alloc-shim-is-unstable.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix build errors:
-
-error[E0428]: the name `__rust_alloc_error_handler_should_panic_v2` is defined multiple times
-   --> ../../build/rust/allocator/lib.rs:101:5
-
-error: undefined symbol: __rust_no_alloc_shim_is_unstable
-
-diff -up chromium-141.0.7390.37/build/rust/allocator/lib.rs.rust-no-alloc-shim-is-unstable chromium-141.0.7390.37/build/rust/allocator/lib.rs
---- chromium-141.0.7390.37/build/rust/allocator/lib.rs.rust-no-alloc-shim-is-unstable	2025-09-23 22:21:14.000000000 +0200
-+++ chromium-141.0.7390.37/build/rust/allocator/lib.rs	2025-09-27 15:14:54.661952048 +0200
-@@ -103,6 +103,11 @@ mod both_allocators {
-     #[linkage = "weak"]
-     static __rust_alloc_error_handler_should_panic: u8 = 0;
- 
-+    // Mangle the symbol name as rustc (1.84) expects on EL9
-+    #[unsafe(no_mangle)]
-+    #[linkage = "weak"]
-+    static __rust_no_alloc_shim_is_unstable: u8 = 0;
-+
-     // Mangle the symbol name as rustc expects.
-     #[rustc_std_internal_symbol]
-     #[allow(non_upper_case_globals)]

diff --git a/chromium-148-el9-python-3.9-build-error.patch b/chromium-148-el9-python-3.9-build-error.patch
deleted file mode 100644
index fed001f..0000000
--- a/chromium-148-el9-python-3.9-build-error.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Fix build error caused by python-3.9 (epel9)
-
-  File "/builddir/build/BUILD/chromium-148.0.7778.96/out/Release/../../tools/metrics/histograms/generate_allowlist_from_histograms_file.py", line 13, in <module>
-    import chromium_src.tools.metrics.histograms.extract_histograms as extract_histograms
-  File "/builddir/build/BUILD/chromium-148.0.7778.96/tools/metrics/histograms/extract_histograms.py", line 170, in <module>
-    tree: xml.dom.minidom.Element | xml.dom.minidom.Document,
-TypeError: unsupported operand type(s) for |: 'type' and 'type'
-
-diff -up chromium-148.0.7778.96/tools/metrics/histograms/extract_histograms.py.me chromium-148.0.7778.96/tools/metrics/histograms/extract_histograms.py
---- chromium-148.0.7778.96/tools/metrics/histograms/extract_histograms.py.me	2026-05-07 20:35:12.049515419 +0200
-+++ chromium-148.0.7778.96/tools/metrics/histograms/extract_histograms.py	2026-05-07 20:41:12.264926376 +0200
-@@ -15,6 +15,7 @@ import itertools
- import logging
- import re
- from typing import Optional, TypedDict
-+from typing import Dict, List, Tuple, Union
- import xml.dom.minidom
- 
- import setup_modules  # pylint: disable=unused-import
-@@ -167,7 +168,10 @@ def ExpandHistogramNameWithSuffixes(
- 
- 
- def ExtractEnumsFromXmlTree(
--    tree: xml.dom.minidom.Element | xml.dom.minidom.Document,
-+    tree: Union[
-+        xml.dom.minidom.Element,
-+        xml.dom.minidom.Document,
-+    ],
- ) -> tuple[dict[str, EnumDict], ExtractionErrors]:
-   """Extracts all <enum> nodes in the tree into a dictionary.
- 
-@@ -497,7 +501,10 @@ def _ExtractVariantNodes(node: xml.dom.m
- 
- 
- def ExtractHistogramsFromXmlTree(
--    tree: xml.dom.minidom.Element | xml.dom.minidom.Document,
-+    tree: Union[
-+        xml.dom.minidom.Element,
-+        xml.dom.minidom.Document,
-+    ],
-     enums: dict[str, EnumDict]
- ) -> tuple[dict[str, HistogramDict], dict[str, list[TokenDict]],
-            ExtractionErrors]:
-@@ -620,7 +627,10 @@ def ExtractHistogramsFromXmlTree(
- 
- 
- def ExtractVariantsFromXmlTree(
--    tree: xml.dom.minidom.Element | xml.dom.minidom.Document,
-+    tree: Union[
-+        xml.dom.minidom.Element,
-+        xml.dom.minidom.Document,
-+    ],
- ) -> tuple[dict[str, list[VariantDict]], ExtractionErrors]:
-   """Extracts all <variants> nodes in the tree into a dictionary.
- 
-@@ -664,7 +674,10 @@ def _GetObsoleteReason(node: xml.dom.min
- 
- 
- def UpdateHistogramsWithSuffixes(
--    tree: xml.dom.minidom.Element | xml.dom.minidom.Document,
-+    tree: Union[
-+        xml.dom.minidom.Element,
-+        xml.dom.minidom.Document,
-+    ],
-     histograms: dict[str, HistogramDict]) -> ExtractionErrors:
-   """Processes <histogram_suffixes> tags and combines with affected histograms.
- 

diff --git a/chromium-148-rust-1.88-enable-unstable_features.patch b/chromium-148-rust-1.88-enable-unstable_features.patch
deleted file mode 100644
index 9b38b7d..0000000
--- a/chromium-148-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_4/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 148.0.7778.96/third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_4/src/lib.rs.me 148.0.7778.96/third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_4/src/lib.rs
---- 148.0.7778.96/third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_4/src/lib.rs.me	2026-02-12 20:44:24.000000000 +0100
-+++ 148.0.7778.96/third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_4/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 148.0.7778.96/third_party/rust/chromium_crates_io/vendor/jxl_transforms-v0_4/src/lib.rs.me 148.0.7778.96/third_party/rust/chromium_crates_io/vendor/jxl_transforms-v0_4/src/lib.rs
---- 148.0.7778.96/third_party/rust/chromium_crates_io/vendor/jxl_transforms-v0_4/src/lib.rs.me	2026-02-12 20:44:24.000000000 +0100
-+++ 148.0.7778.96/third_party/rust/chromium_crates_io/vendor/jxl_transforms-v0_4/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 148.0.7778.96/third_party/rust/chromium_crates_io/vendor/jxl-v0_4/src/lib.rs.me 148.0.7778.96/third_party/rust/chromium_crates_io/vendor/jxl-v0_4/src/lib.rs
---- 148.0.7778.96/third_party/rust/chromium_crates_io/vendor/jxl-v0_4/src/lib.rs.me	2026-02-12 20:44:24.000000000 +0100
-+++ 148.0.7778.96/third_party/rust/chromium_crates_io/vendor/jxl-v0_4/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 148.0.7778.96/third_party/rust/jxl_simd/v0_4/BUILD.gn.me 148.0.7778.96/third_party/rust/jxl_simd/v0_4/BUILD.gn
---- 148.0.7778.96/third_party/rust/jxl_simd/v0_4/BUILD.gn.me	2026-02-12 20:44:24.000000000 +0100
-+++ 148.0.7778.96/third_party/rust/jxl_simd/v0_4/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 148.0.7778.96/third_party/rust/jxl_transforms/v0_4/BUILD.gn.me 148.0.7778.96/third_party/rust/jxl_transforms/v0_4/BUILD.gn
---- 148.0.7778.96/third_party/rust/jxl_transforms/v0_4/BUILD.gn.me	2026-02-12 20:44:24.000000000 +0100
-+++ 148.0.7778.96/third_party/rust/jxl_transforms/v0_4/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_4: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 148.0.7778.96/third_party/rust/jxl/v0_4/BUILD.gn.me 148.0.7778.96/third_party/rust/jxl/v0_4/BUILD.gn
---- 148.0.7778.96/third_party/rust/jxl/v0_4/BUILD.gn.me	2026-02-12 20:44:24.000000000 +0100
-+++ 148.0.7778.96/third_party/rust/jxl/v0_4/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-152-clang++-unknown-argument.patch b/chromium-152-clang++-unknown-argument.patch
deleted file mode 100644
index 0b87242..0000000
--- a/chromium-152-clang++-unknown-argument.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -up chromium-152.0.7977.75/build/config/compiler/BUILD.gn.clang++-unknown-argument chromium-152.0.7977.75/build/config/compiler/BUILD.gn
---- chromium-152.0.7977.75/build/config/compiler/BUILD.gn.clang++-unknown-argument	2026-09-02 17:48:46.431579584 +0700
-+++ chromium-152.0.7977.75/build/config/compiler/BUILD.gn	2026-09-02 17:48:46.437101551 +0700
-@@ -578,14 +578,6 @@ config("compiler") {
-   if (is_clang) {
-     # Flags for diagnostics.
-     cflags += [ "-fcolor-diagnostics" ]
--    if (!is_wasm) {
--      if (!is_win) {
--        cflags += [ "-fdiagnostics-show-inlining-chain" ]
--      } else {
--        # Combine after https://github.com/llvm/llvm-project/pull/192241
--        cflags += [ "/clang:-fdiagnostics-show-inlining-chain" ]
--      }
--    }
-     if (diagnostics_print_source_range_info && !is_win) {
-       cflags += [ "-fdiagnostics-print-source-range-info" ]
-     }
-@@ -619,9 +611,6 @@ config("compiler") {
-     # The performance improvement does not seem worth the risk. See
-     # https://crbug.com/484082200 for background and https://crrev.com/c/7593035
-     # for discussion.
--    if (!is_wasm) {
--      cflags += [ "-fno-lifetime-dse" ]
--    }
- 
-     # TODO(hans): Remove this once Clang generates better optimized debug info
-     # by default. https://crbug.com/765793
-@@ -1581,12 +1570,7 @@ config("clang_warning_suppression") {
- ubsan_hardening("c_array_bounds") {
-   sanitizer = "array-bounds"
-   condition = !(is_asan && target_cpu == "x86") && !is_wasm
--
--  # Because we've enabled array-bounds sanitizing we also want to suppress
--  # the related warning about "unsafe-buffer-usage-in-static-sized-array",
--  # since we know that the array bounds sanitizing will catch any out-of-
--  # bounds accesses.
--  cflags = [ "-Wno-unsafe-buffer-usage-in-static-sized-array" ]
-+  cflags = [ ]
- }
- 
- # Enable UBSan subset to ensure we always hit `return` statement in non-void
-@@ -1935,9 +1919,6 @@ config("default_warnings") {
-       cflags += [
-         # TODO(crbug.com/432275627): Fix and re-enable.
-         "-Wno-uninitialized-const-pointer",
--
--        # TODO(crbug.com/495753203): Fix and re-enable.
--        "-Wno-unused-but-set-global",
-       ]
-     }
- 
-diff -up chromium-152.0.7977.75/build/config/sanitizers/sanitizers.gni.clang++-unknown-argument chromium-152.0.7977.75/build/config/sanitizers/sanitizers.gni
---- chromium-152.0.7977.75/build/config/sanitizers/sanitizers.gni.clang++-unknown-argument	2026-09-01 05:47:51.000000000 +0700
-+++ chromium-152.0.7977.75/build/config/sanitizers/sanitizers.gni	2026-09-02 17:48:46.438626395 +0700
-@@ -542,7 +542,6 @@ template("ubsan_hardening") {
-         # be usable even in release builds, i.e. as widely as possible.
-         # It's important not to have full-on UBSan workarounds activate
-         # just because we built support for a specific sanitizer.
--        "-fsanitize-ignore-for-ubsan-feature=${invoker.sanitizer}",
-       ]
-       if (defined(invoker.cflags)) {
-         cflags += invoker.cflags
-diff -up chromium-152.0.7977.75/third_party/dawn/src/utils/BUILD.gn.clang++-unknown-argument chromium-152.0.7977.75/third_party/dawn/src/utils/BUILD.gn
---- chromium-152.0.7977.75/third_party/dawn/src/utils/BUILD.gn.clang++-unknown-argument	2026-09-01 05:47:51.000000000 +0700
-+++ chromium-152.0.7977.75/third_party/dawn/src/utils/BUILD.gn	2026-09-02 17:48:46.439703484 +0700
-@@ -216,10 +216,6 @@ config("dawn_warnings") {
-       # -Wlifetime-safety-lifetimebound-violation) are not yet mapped to
-       # toggleable warning flags, so we suppress the entire group and disable
-       # the analysis pass.
--      "-Wno-lifetime-safety",
--      "-Wno-lifetime-safety-all",
--      "-Xclang=-fno-lifetime-safety-inference",
--      "-Xclang=-fno-experimental-lifetime-safety-tu-analysis",
-     ]
- 
-     # P3. Checks that could be nice but probably don't help with hardening.
-diff -up chromium-152.0.7977.75/third_party/pdfium/BUILD.gn.clang++-unknown-argument chromium-152.0.7977.75/third_party/pdfium/BUILD.gn
---- chromium-152.0.7977.75/third_party/pdfium/BUILD.gn.clang++-unknown-argument	2026-09-01 05:47:51.000000000 +0700
-+++ chromium-152.0.7977.75/third_party/pdfium/BUILD.gn	2026-09-02 17:48:46.440379052 +0700
-@@ -183,7 +183,6 @@ config("pdfium_core_config") {
-   if (is_clang) {
-     cflags += [
-       "-Wcovered-switch-default",
--      "-Wlifetime-safety-permissive",
-     ]
-   }
- }
-diff -up chromium-152.0.7977.75/third_party/skia/gn/skia/BUILD.gn.clang++-unknown-argument chromium-152.0.7977.75/third_party/skia/gn/skia/BUILD.gn
---- chromium-152.0.7977.75/third_party/skia/gn/skia/BUILD.gn.clang++-unknown-argument	2026-09-01 05:47:51.000000000 +0700
-+++ chromium-152.0.7977.75/third_party/skia/gn/skia/BUILD.gn	2026-09-02 17:48:46.440937850 +0700
-@@ -552,7 +552,6 @@ config("warnings") {
-       "-Wno-unused-member-function",
-       "-Wno-non-c-typedef-for-linkage",  # Dawn, not Skia per se.
- 
--      "-Wno-lifetime-safety",
-       "-Wno-lifetime-safety-suggestions",
-       "-Wno-lifetime-safety-validations",
- 

diff --git a/chromium-153-clang++-unknown-argument.patch b/chromium-153-clang++-unknown-argument.patch
new file mode 100644
index 0000000..c252ab7
--- /dev/null
+++ b/chromium-153-clang++-unknown-argument.patch
@@ -0,0 +1,91 @@
+diff -up chromium-153.0.8010.36/build/config/compiler/BUILD.gn.clang++-unknown-argument chromium-153.0.8010.36/build/config/compiler/BUILD.gn
+--- chromium-153.0.8010.36/build/config/compiler/BUILD.gn.clang++-unknown-argument	2026-09-14 11:46:30.242704480 +0200
++++ chromium-153.0.8010.36/build/config/compiler/BUILD.gn	2026-09-14 18:47:03.412720207 +0200
+@@ -588,14 +588,6 @@ config("compiler") {
+   if (is_clang) {
+     # Flags for diagnostics.
+     cflags += [ "-fcolor-diagnostics" ]
+-    if (!is_wasm) {
+-      if (!is_win) {
+-        cflags += [ "-fdiagnostics-show-inlining-chain" ]
+-      } else {
+-        # Combine after https://github.com/llvm/llvm-project/pull/192241
+-        cflags += [ "/clang:-fdiagnostics-show-inlining-chain" ]
+-      }
+-    }
+     if (diagnostics_print_source_range_info && !is_win) {
+       cflags += [ "-fdiagnostics-print-source-range-info" ]
+     }
+@@ -629,9 +621,6 @@ config("compiler") {
+     # The performance improvement does not seem worth the risk. See
+     # https://crbug.com/484082200 for background and https://crrev.com/c/7593035
+     # for discussion.
+-    if (!is_wasm) {
+-      cflags += [ "-fno-lifetime-dse" ]
+-    }
+ 
+     # TODO(hans): Remove this once Clang generates better optimized debug info
+     # by default. https://crbug.com/765793
+@@ -1596,7 +1585,7 @@ ubsan_hardening("c_array_bounds") {
+   # the related warning about "unsafe-buffer-usage-in-static-sized-array",
+   # since we know that the array bounds sanitizing will catch any out-of-
+   # bounds accesses.
+-  cflags = [ "-Wno-unsafe-buffer-usage-in-static-sized-array" ]
++  cflags = [ ]
+ }
+ 
+ # Enable UBSan subset to ensure we always hit `return` statement in non-void
+@@ -1953,9 +1942,6 @@ config("default_warnings") {
+       cflags += [
+         # TODO(crbug.com/432275627): Fix and re-enable.
+         "-Wno-uninitialized-const-pointer",
+-
+-        # TODO(crbug.com/495753203): Fix and re-enable.
+-        "-Wno-unused-but-set-global",
+       ]
+     }
+ 
+diff -up chromium-153.0.8010.36/build/config/sanitizers/sanitizers.gni.clang++-unknown-argument chromium-153.0.8010.36/build/config/sanitizers/sanitizers.gni
+--- chromium-153.0.8010.36/build/config/sanitizers/sanitizers.gni.clang++-unknown-argument	2026-09-07 12:14:27.000000000 +0200
++++ chromium-153.0.8010.36/build/config/sanitizers/sanitizers.gni	2026-09-14 11:46:30.246291854 +0200
+@@ -549,7 +549,6 @@ template("ubsan_hardening") {
+         # be usable even in release builds, i.e. as widely as possible.
+         # It's important not to have full-on UBSan workarounds activate
+         # just because we built support for a specific sanitizer.
+-        "-fsanitize-ignore-for-ubsan-feature=${invoker.sanitizer}",
+       ]
+       if (defined(invoker.cflags)) {
+         cflags += invoker.cflags
+diff -up chromium-153.0.8010.36/third_party/dawn/src/utils/BUILD.gn.clang++-unknown-argument chromium-153.0.8010.36/third_party/dawn/src/utils/BUILD.gn
+--- chromium-153.0.8010.36/third_party/dawn/src/utils/BUILD.gn.clang++-unknown-argument	2026-09-07 12:14:27.000000000 +0200
++++ chromium-153.0.8010.36/third_party/dawn/src/utils/BUILD.gn	2026-09-14 18:48:38.037295122 +0200
+@@ -214,7 +214,6 @@ config("dawn_warnings") {
+       # -Wlifetime-safety-lifetimebound-violation) are not yet mapped to
+       # toggleable warning flags, so we suppress the entire group and disable
+       # the analysis pass.
+-      "-Wno-lifetime-safety-all",
+     ]
+ 
+     # P3. Checks that could be nice but probably don't help with hardening.
+diff -up chromium-153.0.8010.36/third_party/pdfium/BUILD.gn.clang++-unknown-argument chromium-153.0.8010.36/third_party/pdfium/BUILD.gn
+--- chromium-153.0.8010.36/third_party/pdfium/BUILD.gn.clang++-unknown-argument	2026-09-07 12:14:27.000000000 +0200
++++ chromium-153.0.8010.36/third_party/pdfium/BUILD.gn	2026-09-14 11:46:30.247377014 +0200
+@@ -175,7 +175,6 @@ config("pdfium_core_config") {
+   if (is_clang) {
+     cflags += [
+       "-Wcovered-switch-default",
+-      "-Wlifetime-safety-permissive",
+     ]
+   }
+ }
+diff -up chromium-153.0.8010.36/third_party/skia/gn/skia/BUILD.gn.clang++-unknown-argument chromium-153.0.8010.36/third_party/skia/gn/skia/BUILD.gn
+--- chromium-153.0.8010.36/third_party/skia/gn/skia/BUILD.gn.clang++-unknown-argument	2026-09-07 12:14:27.000000000 +0200
++++ chromium-153.0.8010.36/third_party/skia/gn/skia/BUILD.gn	2026-09-14 11:46:30.249038496 +0200
+@@ -552,7 +552,6 @@ config("warnings") {
+       "-Wno-unused-member-function",
+       "-Wno-non-c-typedef-for-linkage",  # Dawn, not Skia per se.
+ 
+-      "-Wno-lifetime-safety",
+       "-Wno-lifetime-safety-suggestions",
+       "-Wno-lifetime-safety-validations",
+ 

diff --git a/chromium-153-ftbfs-crubit.patch b/chromium-153-ftbfs-crubit.patch
new file mode 100644
index 0000000..0418d5d
--- /dev/null
+++ b/chromium-153-ftbfs-crubit.patch
@@ -0,0 +1,39 @@
+diff -up chromium-153.0.8010.36/build/rust/crubit/BUILD.gn.crubit chromium-153.0.8010.36/build/rust/crubit/BUILD.gn
+--- chromium-153.0.8010.36/build/rust/crubit/BUILD.gn.crubit	2026-09-14 20:15:59.508609350 +0200
++++ chromium-153.0.8010.36/build/rust/crubit/BUILD.gn	2026-09-14 20:17:25.612646097 +0200
+@@ -8,8 +8,6 @@ import("//build_overrides/crubit.gni")
+ group("crubit") {
+   public_configs = [ ":public_config" ]
+   public_deps = [
+-    "$crubit_src_dir/support:support_cpp",
+-    "$crubit_src_dir/support/rs_std:rs_std_cpp",
+     "//build/rust/std/rules:alloc_bindings",
+     "//build/rust/std/rules:core_bindings",
+     "//build/rust/std/rules:std_bindings",
+@@ -28,7 +26,6 @@ config("public_config") {
+ # Dependencies of the `.h` file generated by `cpp_api_from_rust`.
+ group("cpp_api_from_rust_bindings_cpp_deps") {
+   public_configs = [ ":public_config" ]
+-  public_deps = [ "$crubit_src_dir:cpp_api_from_rust_bindings_cpp_deps" ]
+ }
+ 
+ # Dependencies of the `.rs` file generated by `cpp_api_from_rust`.
+diff -up chromium-153.0.8010.36/third_party/blink/renderer/platform/BUILD.gn.crubit chromium-153.0.8010.36/third_party/blink/renderer/platform/BUILD.gn
+--- chromium-153.0.8010.36/third_party/blink/renderer/platform/BUILD.gn.crubit	2026-09-14 20:17:43.578150010 +0200
++++ chromium-153.0.8010.36/third_party/blink/renderer/platform/BUILD.gn	2026-09-14 20:34:13.459447295 +0200
+@@ -1794,7 +1794,6 @@ 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",
+@@ -1822,7 +1821,6 @@ component("platform") {
+   ]
+   deps = [
+     ":rustfft_ffi",
+-    "fonts:font_format_bindings",
+     "//base:base_static",
+     "//base/allocator:buildflags",
+     "//build:chromecast_buildflags",

diff --git a/chromium-153-rust-1.88-enable-unstable_features.patch b/chromium-153-rust-1.88-enable-unstable_features.patch
new file mode 100644
index 0000000..7234a23
--- /dev/null
+++ b/chromium-153-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_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.spec b/chromium.spec
index aa8a97e..4683afc 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -271,7 +271,7 @@
 %endif
 
 Name:	chromium
-Version: 152.0.7977.82
+Version: 153.0.8010.36
 Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
@@ -353,12 +353,9 @@ 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
 # fix ftbfs caused by old rustc-1.88 on el9 and 10.1
-Patch143: chromium-148-rust-1.88-enable-unstable_features.patch
+Patch143: chromium-153-rust-1.88-enable-unstable_features.patch
 Patch144: chromium-146-rust-1.88-undefined-symbol.patch
 
-# Fix FTBFS with python-3.9 on el9
-Patch146: chromium-148-el9-python-3.9-build-error.patch
-
 # add correct path for Qt6Gui header and libs
 Patch150: chromium-124-qt6.patch
 
@@ -391,10 +388,11 @@ Patch310: chromium-139-rust-FTBFS-suppress-warnings.patch
 # enable fstack-protector-strong
 Patch311: chromium-123-fstack-protector-strong.patch
 
-# Fix FTBFS: undefined symbol: __rust_no_alloc_shim_is_unstable on EL9
-# Error: unsafe attribute used without unsafe
-#    --> ../../build/rust/allocator/lib.rs:107:7
-Patch312: chromium-143-el9-rust-no-alloc-shim-is-unstable.patch
+# Fix FTBFS:
+# 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
 
 # old rust version causes build error on el8:
 # error[E0599]: no method named `is_none_or` found for enum `Option` in the current scope
@@ -406,7 +404,7 @@ Patch315: chromium-145-rustc-ftbfs.patch
 # llvm <= 22
 # clang++: error: unknown argument: '-fno-lifetime-dse'
 # unknown warning option -Wno-nontrivial-memcall
-Patch316: chromium-152-clang++-unknown-argument.patch
+Patch316: chromium-153-clang++-unknown-argument.patch
 
 Patch318: memory-allocator-dcheck-assert-fix.patch
 
@@ -492,7 +490,6 @@ Patch402: fix-rust-linking.patch
 Patch403: fix-breakpad-compile.patch
 Patch405: fix-study-crash.patch
 Patch407: fix-different-data-layouts.patch
-Patch408: 0002-Add-ppc64-trap-instructions.patch
 
 Patch409: fix-page-allocator-overflow.patch
 Patch410: 0001-Enable-ppc64-pointer-compression.patch
@@ -1126,10 +1123,6 @@ Qt6 UI for chromium.
 %patch -P144 -p1 -b .rust-1.88-undefined-symbol
 %endif
 
-%if 0%{?rhel} == 9
-%patch -P146 -p1 -b .el9-python-3.9-build-error
-%endif
-
 %patch -P150 -p1 -b .qt6
 
 %patch -P300 -p1 -b .swiftshader-missing-include
@@ -1154,6 +1147,7 @@ Qt6 UI for chromium.
 %patch -P315 -p1 -b .rustc-ftbfs
 %patch -P310 -p1 -b .rust-FTBFS-suppress-warnings
 %patch -P311 -p1 -b .fstack-protector-strong
+%patch -P312 -p1 -b .ftbfs-crubit
 
 %if 0%{?rhel} && 0%{?rhel} < 10
 %patch -P354 -p1 -b .split-threshold-for-reg-with-hint
@@ -1221,7 +1215,6 @@ Qt6 UI for chromium.
 %patch -P403 -p1 -b .fix-breakpad-compile
 %patch -P405 -p1 -b .fix-study-crash
 %patch -P407 -p1 -b .fix-different-data-layouts
-%patch -P408 -p1 -b .0002-Add-ppc64-trap-instructions
 %patch -P409 -p1 -b .fix-page-allocator-overflow
 %patch -P410 -p1 -b .0001-Enable-ppc64-pointer-compression
 %patch -P411 -p1 -b .dawn-fix-ppc64le-detection
@@ -1918,6 +1911,239 @@ fi
 %endif
 
 %changelog
+* 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
+  * CVE-2026-87430: Buffer overflow in WebRTC
+  * CVE-2026-87431: Missing authorization in Extensions
+  * CVE-2026-87432: Incorrect authorization in Navigation
+  * CVE-2026-87433: Race condition in FileAPI
+  * CVE-2026-87434: Missing authorization in CORS
+  * CVE-2026-87435: Information leak in ControlledFrame
+  * CVE-2026-87436: Incomplete cleanup in Browser
+  * CVE-2026-87437: Information leak in Frames
+  * CVE-2026-87438: Out of bounds write in WebGL
+  * CVE-2026-87439: Information leak in ServiceWorker
+  * CVE-2026-87440: Out of bounds read in Media
+  * CVE-2026-87441: Missing authorization in Downloads
+  * CVE-2026-87442: Confused deputy in Prerender
+  * CVE-2026-87443: Missing authorization in Actor
+  * CVE-2026-87444: Memory corruption in Codecs
+  * CVE-2026-87445: UI misrepresentation in Session
+  * CVE-2026-87446: Incomplete cleanup in Extensions
+  * CVE-2026-87447: Incorrect authorization in Network
+  * CVE-2026-87448: Use after free in DevTools
+  * CVE-2026-87449: Cross-site request forgery in DeviceBoundSessionCredentials
+  * CVE-2026-87450: Incorrect authorization in Permissions
+  * CVE-2026-87451: Information leak in Downloads
+  * CVE-2026-87452: Incorrect authorization in GPU
+  * CVE-2026-87453: Confused deputy in BackgroundFetch
+  * CVE-2026-87454: Information leak in Enterprise
+  * CVE-2026-87455: Use after free in Aura
+  * CVE-2026-87456: Uninitialized resource in Media
+  * CVE-2026-87457: Race condition in Updater
+  * CVE-2026-87458: UI misrepresentation in Geometry
+  * CVE-2026-87459: Observable discrepancy in Select
+  * CVE-2026-87460: Use after free in Platform
+  * CVE-2026-87461: Information leak in Core
+  * CVE-2026-87462: UI misrepresentation in FedCM
+  * CVE-2026-87463: Incorrect authorization in Certificate
+  * CVE-2026-87464: Use after free in WebGL
+  * CVE-2026-87465: Incorrect authorization in Downloads
+  * CVE-2026-87466: Incorrect authorization in Workers
+  * CVE-2026-87467: Race condition in Updater
+  * CVE-2026-87468: Incorrect authorization in Isolated
+  * CVE-2026-87469: Improper input validation in Extensions
+  * CVE-2026-87470: Improper quantity validation in Tint
+  * CVE-2026-87471: Incorrect authorization in ServiceWorker
+  * CVE-2026-87472: Improper input validation in FedCM
+  * CVE-2026-87473: Incorrect authorization in FileHandling
+  * CVE-2026-87474: Use after free in Payments
+  * CVE-2026-87475: Missing authorization in Omnibox
+  * CVE-2026-87476: Incorrect authorization in Loader
+  * CVE-2026-87477: Information leak in Core
+  * CVE-2026-87478: Observable discrepancy in Autofill
+  * CVE-2026-87479: Insufficient policy enforcement in Extensions
+  * CVE-2026-87480: Use after free in Printing
+  * CVE-2026-87481: Incorrect authorization in WebView
+  * CVE-2026-87482: Cleartext transmission of sensitive data in HttpsUpgrades
+  * CVE-2026-87483: Incorrect authorization in Browser
+  * CVE-2026-87484: UI misrepresentation in Geometry
+  * CVE-2026-87485: Incorrect authorization in CORS
+  * CVE-2026-87486: Clickjacking in TrustedWebActivities
+  * CVE-2026-87487: Missing authorization in FileSystem
+  * CVE-2026-87488: Use after free in WebGL
+  * CVE-2026-87489: Memory corruption in V8
+  * CVE-2026-87490: Information leak in Transactions Platform
+  * CVE-2026-87491: Out of bounds write in V8
+  * CVE-2026-87492: Incorrect authorization in DevTools
+  * CVE-2026-87493: Missing authorization in FileSystem
+  * CVE-2026-87494: Use after free in Browser
+  * CVE-2026-87495: Information leak in Scroll
+  * CVE-2026-87496: UI misrepresentation in Browser
+  * CVE-2026-87497: Uninitialized resource in Codecs
+  * CVE-2026-87498: Missing authorization in WebUI
+  * CVE-2026-87499: Incorrect authorization in Network
+  * CVE-2026-87500: Improper validation of array index in ANGLE
+  * CVE-2026-87501: UI misrepresentation in Passwords
+  * CVE-2026-87502: Confused deputy in Fullscreen
+  * CVE-2026-87503: Inappropriate implementation in Downloads
+  * CVE-2026-87504: Use after free in Core
+  * CVE-2026-87505: Incorrect authorization in FileSystem
+  * CVE-2026-87506: Privilege elevation in WebUI
+  * CVE-2026-87507: UI misrepresentation in Downloads
+  * CVE-2026-87508: Incorrect authorization in Loader
+  * CVE-2026-87509: Incorrect authorization in Updater
+  * CVE-2026-87510: Improper input validation in FileAPI
+  * CVE-2026-87511: Missing authorization in DevTools
+  * CVE-2026-87512: Use after free in ANGLE
+  * CVE-2026-87513: Missing authorization in ControlledFrame
+  * CVE-2026-87514: Use after free in Views
+  * CVE-2026-87515: Incorrect authorization in FileAPI
+  * CVE-2026-87516: Observable discrepancy in Navigation
+  * CVE-2026-87517: Race condition in Mobile
+  * CVE-2026-87518: Observable discrepancy in Safebrowsing
+  * CVE-2026-87519: Incorrect authorization in Safebrowsing
+  * CVE-2026-87520: Use after free in Dawn
+  * CVE-2026-87521: Information leak in WebMCP
+  * CVE-2026-87522: Missing authorization in WebView
+  * CVE-2026-87523: Race condition in DataTransfer
+  * CVE-2026-87524: Use after free in Core
+  * CVE-2026-87525: Out of bounds read in Chromoting
+  * CVE-2026-87526: Use after free in Passwords
+  * CVE-2026-87527: Buffer overflow in WebGL
+  * CVE-2026-87528: Type confusion in Rust
+  * CVE-2026-87529: Numeric truncation error in Media
+  * CVE-2026-87530: Uncontrolled search path element in CredentialProvider
+  * CVE-2026-87531: Information leak in CORS
+  * CVE-2026-87532: Improper state validation in Safebrowsing
+  * CVE-2026-87533: Use after free in DevTools
+  * CVE-2026-87534: Missing authorization in WebView
+  * CVE-2026-87535: Information loss or omission in Safebrowsing
+  * CVE-2026-87536: Use after free in V8
+  * CVE-2026-87537: Missing authorization in Extensions
+  * CVE-2026-87538: Clickjacking in Input
+  * CVE-2026-87539: Observable discrepancy in Network
+  * CVE-2026-87540: Incorrect authorization in Isolated
+  * CVE-2026-87541: Information leak in Navigation
+  * CVE-2026-87542: Use after free in Input
+  * CVE-2026-87543: Missing authorization in Core
+  * CVE-2026-87544: Incorrect authorization in Extensions
+  * CVE-2026-87545: Information leak in Mobile
+  * CVE-2026-87546: Incorrect type conversion or cast in Safebrowsing
+  * CVE-2026-87547: Incorrect reference resolution in FileSystem
+  * CVE-2026-87548: Improper state validation in Installer
+  * CVE-2026-87549: Incomplete cleanup in Downloads
+  * CVE-2026-87550: Improper encoding or escaping of output in CSS
+  * CVE-2026-87551: Improper certificate validation in CORS
+  * CVE-2026-87552: Missing authorization in TrustedWebActivities
+  * CVE-2026-87553: Improper input validation in SiteIsolation
+  * CVE-2026-87554: Race condition in Chromoting
+  * CVE-2026-87555: Uninitialized resource in GPU
+  * CVE-2026-87556: Missing authorization in Browser
+  * CVE-2026-87557: Missing authorization in LocalNetworkAccess
+  * CVE-2026-87558: Use after free in Payments
+  * CVE-2026-87559: UI misrepresentation in UI
+  * CVE-2026-87560: Missing authorization in Browser
+  * CVE-2026-87561: Incorrect authorization in Web Authentication
+  * CVE-2026-87562: Incorrect reference resolution in Accessibility
+  * CVE-2026-87563: Origin validation error in Paint
+  * CVE-2026-87564: Type confusion in V8
+  * CVE-2026-87565: Information leak in Passwords
+  * CVE-2026-87566: Observable discrepancy in Layout
+  * CVE-2026-87567: UI misrepresentation in UrlFormatting
+  * CVE-2026-87568: Improper input validation in Chromium
+  * CVE-2026-87569: Missing authorization in Views
+  * CVE-2026-87570: Incorrect authorization in SiteIsolation
+  * CVE-2026-87571: Improper certificate validation in Loader
+  * CVE-2026-87572: Injection in DevTools
+  * CVE-2026-87573: Improper input validation in Network
+  * CVE-2026-87574: Information leak in ServiceWorker
+  * CVE-2026-87575: Incorrect authorization in Loader
+  * CVE-2026-87576: Uninitialized resource in GPU
+  * CVE-2026-87577: Incorrect authorization in Isolated
+  * CVE-2026-87578: Use after free in Receiver
+  * CVE-2026-87579: Buffer overflow in WebRTC
+  * CVE-2026-87580: Incorrect authorization in WebAppInstalls
+  * CVE-2026-87581: Use after free in Payments
+  * CVE-2026-87582: Confused deputy in DataTransfer
+  * CVE-2026-87583: UI misrepresentation in Passwords
+  * CVE-2026-87584: Incorrect authorization in WebUI
+  * CVE-2026-87585: Double free in PDFium
+  * CVE-2026-87586: Out of bounds read in ANGLE
+  * CVE-2026-87587: Use after free in V8
+  * CVE-2026-87588: Use after free in Chromecast
+  * CVE-2026-87589: Incorrect authorization in SiteIsolation
+  * CVE-2026-87590: Improper input validation in Passwords
+  * CVE-2026-87591: Incorrect authorization in Extensions
+  * CVE-2026-87592: Out of bounds read in Tint
+  * CVE-2026-87593: Information leak in Editing
+  * CVE-2026-87594: Incorrect authorization in DataTransfer
+  * CVE-2026-87595: Server-side request forgery in Mobile
+  * CVE-2026-87596: Out of bounds read in ANGLE
+  * CVE-2026-87597: UI misrepresentation in CustomTabs
+  * CVE-2026-87598: Incorrect authorization in ServiceWorker
+  * CVE-2026-87599: Improper input validation in Interstitials
+  * CVE-2026-87600: Improper input validation in Safebrowsing
+  * CVE-2026-87601: Race condition in V8
+  * CVE-2026-87602: Out of bounds read in ANGLE
+  * CVE-2026-87603: Missing authorization in FileSystem
+  * CVE-2026-87604: Out of bounds read in ANGLE
+  * CVE-2026-87605: Missing authorization in Contacts
+  * CVE-2026-87606: Missing authorization in SiteIsolation
+  * CVE-2026-87607: Use after free in Device
+  * CVE-2026-87608: Improper certificate validation in FedCM
+  * CVE-2026-87609: Use after free in Sharing
+  * CVE-2026-87610: Incorrect authorization in Omnibox
+  * CVE-2026-87611: Missing authorization in FileSystem
+  * CVE-2026-87612: Type confusion in V8
+  * CVE-2026-87613: Incorrect reference resolution in Extensions
+  * CVE-2026-87614: Incorrect authorization in ServiceWorker
+  * CVE-2026-87615: Race condition in Payments
+  * CVE-2026-87616: Improper initialization in Views
+  * CVE-2026-87617: Use after free in DevTools
+  * CVE-2026-87618: Incorrect reference resolution in Storage
+  * CVE-2026-87619: Observable discrepancy in Prefetch
+  * CVE-2026-87620: Observable discrepancy in SVG
+  * CVE-2026-87621: Out of bounds write in ANGLE
+  * CVE-2026-87622: Missing authorization in FedCM
+  * CVE-2026-87623: Observable discrepancy in DOM
+  * CVE-2026-87624: UI misrepresentation in Passwords
+  * CVE-2026-87625: Use after free in V8
+  * CVE-2026-87626: Incorrect authorization in DeviceBoundSessionCredentials
+  * CVE-2026-87627: Interpretation conflict in Safebrowsing
+  * CVE-2026-87628: Use after free in Cast
+  * CVE-2026-87629: Incorrect authorization in Sources
+  * CVE-2026-87630: Integer overflow in WebRTC
+  * CVE-2026-87631: Missing authorization in DOM
+  * CVE-2026-87632: Cross-site scripting in SanitizerAPI
+  * CVE-2026-87633: Use after free in Views
+  * CVE-2026-87634: Use after free in WebPackaging
+  * CVE-2026-87635: UI misrepresentation in Payments
+  * CVE-2026-87636: Type confusion in XML
+  * CVE-2026-87637: Use after free in Extensions
+  * CVE-2026-87638: Out of bounds write in Media
+  * CVE-2026-87639: Use after free in WebPackaging
+  * CVE-2026-87640: Out of bounds read in WebView
+  * CVE-2026-87641: Race condition in Browser
+  * CVE-2026-87642: Uninitialized resource in WebGL
+  * CVE-2026-87643: Integer overflow in GPU
+  * CVE-2026-87644: Incorrect authorization in Views
+  * CVE-2026-87645: Improper state validation in Safebrowsing
+  * CVE-2026-87646: Use after free in Web Authentication
+  * CVE-2026-87647: Uninitialized resource in GPU
+  * CVE-2026-87648: Use after free in ANGLE
+  * CVE-2026-87649: UI misrepresentation in Downloads
+  * CVE-2026-87650: Out of bounds read in WebGL
+  * CVE-2026-87651: Incorrect authorization in Paint
+  * CVE-2026-87652: Incorrect authorization in PushAPI
+  * CVE-2026-87653: UI misrepresentation in FullScreen
+  * CVE-2026-87654: Buffer overflow in ANGLE
+  * CVE-2026-87655: Clickjacking in Downloads
+  * CVE-2026-87656: Improper state validation in Safebrowsing
+  * CVE-2026-87657: Use after free in V8
+  * CVE-2026-87658: Information leak in Extensions
+
 * Sat Sep 05 2026 Than Ngo <than@redhat.com> - 152.0.7977.82-1
 - Update to 152.0.7977.82
   * CVE-2026-85046: Type confusion in V8

diff --git a/disable-ai.patch b/disable-ai.patch
index 571653f..152c913 100644
--- a/disable-ai.patch
+++ b/disable-ai.patch
@@ -3,64 +3,27 @@
 
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3129,8 +3129,6 @@ source_set("browser") {
-       "//chrome/app:command_ids",
-       "//chrome/app/theme:chrome_unscaled_resources_grit",
-       "//chrome/app/vector_icons",
--      "//chrome/browser/accessibility/tree_fixing:prefs",
--      "//chrome/browser/accessibility/tree_fixing:service",
-       "//chrome/browser/accessibility_annotator/content_annotator",
-       "//chrome/browser/actor/ui",
-       "//chrome/browser/actor/ui:actor_overlay",
-@@ -3179,11 +3177,6 @@ source_set("browser") {
+@@ -2806,9 +2806,6 @@ source_set("browser") {
        "//chrome/browser/profile_resetter:impl",
        "//chrome/browser/record_replay",
        "//chrome/browser/record_replay:impl",
--      "//chrome/browser/screen_ai:prefs",
--      "//chrome/browser/screen_ai:screen_ai_downloader",
 -      "//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/one_time_tokens",
        "//chrome/browser/sharing_hub",
        "//chrome/browser/sharing_hub:impl",
-@@ -3261,7 +3254,6 @@ source_set("browser") {
+       "//chrome/browser/smart_card",
+@@ -2868,7 +2865,6 @@ source_set("browser") {
+       "//chrome/browser/ui/web_applications:impl",
        "//chrome/browser/ui/webui:webui_util",
-       "//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/commerce",
        "//chrome/browser/ui/webui/commerce:impl",
-@@ -3374,9 +3366,6 @@ source_set("browser") {
-       "//components/webauthn/core/browser",
-       "//components/webauthn/core/browser:passkey_model",
-       "//services/device/public/cpp/hid",
--      "//services/screen_ai",
--      "//services/screen_ai/public/cpp:utilities",
--      "//services/screen_ai/public/mojom",
-       "//third_party/crashpad/crashpad/client:common",
-       "//third_party/zxcvbn-cpp",
-       "//ui/views",
-@@ -3778,7 +3767,6 @@ source_set("browser") {
-       "//chrome/browser/policy:system_features_disable_list",
-       "//chrome/browser/push_notification",
-       "//chrome/browser/resources:app_icon_resources",
--      "//chrome/browser/screen_ai:screen_ai_dlc_installer",
-       "//chrome/browser/sharesheet",
-       "//chrome/browser/sharesheet:impl",
-       "//chrome/browser/support_tool/ash",
-@@ -4040,7 +4028,6 @@ source_set("browser") {
-       "//remoting/host/chromeos:browser_interop",
-       "//remoting/host/chromeos:features",
-       "//services/device/public/cpp/geolocation",
--      "//services/screen_ai/public/cpp:metrics",
-       "//third_party/nearby:rpc_resources_proto",
-       "//third_party/nearby:wire_format_proto",
-       "//ui/chromeos",
 --- a/chrome/browser/accessibility/BUILD.gn
 +++ b/chrome/browser/accessibility/BUILD.gn
-@@ -58,7 +58,6 @@ source_set("accessibility") {
+@@ -59,7 +59,6 @@ source_set("accessibility") {
      public_deps += [
        "//chrome/browser/accessibility/live_caption",
        "//chrome/browser/profiles:profile_manager",
@@ -68,7 +31,7 @@
        "//components/live_caption",
        "//components/pref_registry",
        "//ui/accessibility/platform",
-@@ -87,8 +86,6 @@ source_set("impl") {
+@@ -88,8 +87,6 @@ source_set("impl") {
  
    if (!is_android) {
      sources += [
@@ -77,7 +40,7 @@
        "embedded_a11y_extension_loader.cc",
        "invert_bubble_prefs.cc",
        "page_colors_controller.cc",
-@@ -98,7 +95,6 @@ source_set("impl") {
+@@ -99,7 +96,6 @@ source_set("impl") {
        "//chrome/browser/accessibility/live_caption:impl",
        "//chrome/browser/extensions",
        "//chrome/browser/on_device_translation",
@@ -85,7 +48,7 @@
        "//chrome/browser/ui",
        "//chrome/browser/ui/browser_window",
        "//components/live_caption:live_translate",
-@@ -241,10 +237,6 @@ if (!is_android) {
+@@ -242,10 +238,6 @@ if (!is_android) {
        deps += [ "//chrome/browser/accessibility/live_caption:test_support" ]
      }
  
@@ -94,8 +57,8 @@
 -      "//services/screen_ai/public/cpp:utilities",
 -    ]
  
-     if (is_chromeos) {
-       deps += [ "//chrome/browser/ash/accessibility:test_support" ]
+     if (enable_screen_ai_browsertests) {
+       data_deps += [ "//third_party/screen-ai:screen_ai" ]
 --- a/chrome/browser/accessibility/live_caption/BUILD.gn
 +++ b/chrome/browser/accessibility/live_caption/BUILD.gn
 @@ -44,7 +44,6 @@ source_set("impl") {
@@ -122,7 +85,7 @@
  }
 --- a/chrome/browser/actor/actor_keyed_service.cc
 +++ b/chrome/browser/actor/actor_keyed_service.cc
-@@ -685,13 +685,6 @@ bool ActorKeyedService::IsActiveOnTab(co
+@@ -770,13 +770,6 @@ bool ActorKeyedService::IsActiveOnTab(co
  
  ActorTask* ActorKeyedService::GetTaskFromTab(
      const tabs::TabInterface& tab) const {
@@ -151,7 +114,7 @@
  #include "chrome/browser/usb/usb_status_icon.h"
  #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
  #endif
-@@ -1663,9 +1661,6 @@ void BrowserProcessImpl::PreMainMessageL
+@@ -1667,9 +1665,6 @@ void BrowserProcessImpl::PreMainMessageL
    soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -185,7 +148,7 @@
    std::unique_ptr<BrowserProcessPlatformPart> platform_part_;
 --- a/chrome/browser/chrome_browser_interface_binders.cc
 +++ b/chrome/browser/chrome_browser_interface_binders.cc
-@@ -85,8 +85,6 @@
+@@ -90,8 +90,6 @@
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
      BUILDFLAG(IS_CHROMEOS)
@@ -194,7 +157,7 @@
  #include "chrome/browser/web_applications/sub_apps/sub_apps_service_impl.h"
  #endif
  
-@@ -386,27 +384,6 @@ void BindMediaFoundationPreferences(
+@@ -390,27 +388,6 @@ void BindMediaFoundationPreferences(
  }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -222,7 +185,7 @@
  
  void BindModelBroker(
      content::RenderFrameHost* frame_host,
-@@ -571,10 +548,6 @@ void PopulateChromeFrameBinders(
+@@ -583,10 +560,6 @@ void PopulateChromeFrameBinders(
          &web_app::SubAppsServiceImpl::CreateIfAllowed);
    }
  
@@ -235,7 +198,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
-@@ -523,9 +523,6 @@ void PopulateChromeWebUIFrameBindersPart
+@@ -518,9 +518,6 @@ void PopulateChromeWebUIFrameBindersPart
        ::mojom::app_service_internals::AppServiceInternalsPageHandler,
        AppServiceInternalsUI>(map);
  
@@ -247,7 +210,7 @@
        access_code_cast::mojom::PageHandlerFactory,
 --- a/chrome/browser/component_updater/BUILD.gn
 +++ b/chrome/browser/component_updater/BUILD.gn
-@@ -212,13 +212,6 @@ source_set("impl") {
+@@ -214,13 +214,6 @@ source_set("impl") {
      ]
    }
  
@@ -282,12 +245,68 @@
  
    RegisterCommerceHeuristicsComponent(cus);
  
+--- a/chrome/browser/glic/glic_selection_observer.cc
++++ b/chrome/browser/glic/glic_selection_observer.cc
+@@ -1095,20 +1095,6 @@ void GlicSelectionObserver::OnAskGeminiW
+   }
+ 
+   std::string skill_prompt;
+-  auto* tab_interface =
+-      tabs::TabInterface::MaybeGetFromContents(web_contents());
+-  if (tab_interface) {
+-    if (auto* observer = skills::SkillsUpdateObserver::From(tab_interface)) {
+-      if (const auto* list = observer->contextual_skills()) {
+-        for (const auto& s : list->skills()) {
+-          if (s.id() == skill.id) {
+-            skill_prompt = s.prompt();
+-            break;
+-          }
+-        }
+-      }
+-    }
+-  }
+ 
+   if (skill_prompt.empty()) {
+     Profile* profile =
+@@ -1131,28 +1117,6 @@ void GlicSelectionObserver::OnAskGeminiW
+ std::vector<GlicSelectionWidgetDelegate::SkillOption>
+ GlicSelectionObserver::GetContextualSkills() {
+   std::vector<GlicSelectionWidgetDelegate::SkillOption> result;
+-  if (!features::kGlicSelectionPromptSkills.Get()) {
+-    return result;
+-  }
+-  auto* tab_interface =
+-      tabs::TabInterface::MaybeGetFromContents(web_contents());
+-  if (!tab_interface) {
+-    return result;
+-  }
+-  auto* observer = skills::SkillsUpdateObserver::From(tab_interface);
+-  if (!observer) {
+-    return result;
+-  }
+-  const auto* list = observer->contextual_skills();
+-  if (!list) {
+-    return result;
+-  }
+-  for (const auto& skill : list->skills()) {
+-    if (!skill.id().empty() && !skill.name().empty()) {
+-      result.emplace_back(
+-          skills::Skill(skill.id(), skill.name(), skill.icon(), ""));
+-    }
+-  }
+   return result;
+ }
+ 
 --- a/chrome/browser/glic/host/glic_skills_manager_impl.cc
 +++ b/chrome/browser/glic/host/glic_skills_manager_impl.cc
-@@ -464,35 +464,6 @@ bool GlicSkillsClientSession::Require1PS
+@@ -487,39 +487,6 @@ bool GlicSkillsClientSession::Require1PS
  
  void GlicSkillsClientSession::UpdateSkillPreviews(
      std::optional<tabs::TabInterface*> updated_tab) {
+-  if (!skills::SkillsServiceFactory::IsSkillsEnabledForProfile(
+-          manager_->profile())) {
+-    return;
+-  }
 -  if (!client_) {
 -    return;
 -  }
@@ -490,26 +509,22 @@
  
 --- a/chrome/browser/password_manager/password_change_delegate_impl.cc
 +++ b/chrome/browser/password_manager/password_change_delegate_impl.cc
-@@ -368,16 +368,6 @@ void PasswordChangeDelegateImpl::StartPa
+@@ -344,12 +344,6 @@ void PasswordChangeDelegateImpl::StartPa
            &PasswordChangeDelegateImpl::OnLoginStateCheckedWithoutPIResult,
            weak_ptr_factory_.GetWeakPtr()));
  
--  if (!base::FeatureList::IsEnabled(
--          password_change::features::
--              kPasswordChangeWithPrivateInferenceLoginCheck)) {
--    // This creates FieldClassificationModelHandler and should trigger
--    // download of a local ML model for field classification.
--    // TODO(452883239): Clean this up when model is downloaded on start-up for
--    // everybody.
--    PasswordFieldClassificationModelHandlerFactory::GetForBrowserContext(
--        originator_->GetBrowserContext());
--  }
+-  // This creates FieldClassificationModelHandler and should trigger
+-  // download of a local ML model for field classification.
+-  // TODO(452883239): Clean this up when model is downloaded on start-up for
+-  // everybody.
+-  PasswordFieldClassificationModelHandlerFactory::GetForBrowserContext(
+-      originator_->GetBrowserContext());
  }
  
  void PasswordChangeDelegateImpl::OnLoginStateCheckedWithoutPIResult(
 --- a/chrome/browser/pdf/pdf_extension_util.cc
 +++ b/chrome/browser/pdf/pdf_extension_util.cc
-@@ -138,7 +138,6 @@ base::DictValue GetPdfViewerStrings() {
+@@ -142,7 +142,6 @@ base::DictValue GetPdfViewerStrings() {
        {"rotationStateLabel90", IDS_PDF_ROTATION_STATE_LABEL_90},
        {"rotationStateLabel180", IDS_PDF_ROTATION_STATE_LABEL_180},
        {"rotationStateLabel270", IDS_PDF_ROTATION_STATE_LABEL_270},
@@ -542,7 +557,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"
-@@ -541,8 +540,6 @@ ChromePermissionsClient::CreatePermissio
+@@ -545,8 +544,6 @@ ChromePermissionsClient::CreatePermissio
  #endif
    selectors.emplace_back(std::make_unique<PrefBasedQuietPermissionUiSelector>(
        Profile::FromBrowserContext(browser_context)));
@@ -551,7 +566,7 @@
    return selectors;
  }
  
-@@ -564,8 +561,6 @@ void ChromePermissionsClient::OnPromptRe
+@@ -568,8 +565,6 @@ void ChromePermissionsClient::OnPromptRe
  
    Profile* profile =
        Profile::FromBrowserContext(web_contents->GetBrowserContext());
@@ -583,7 +598,7 @@
  }
 --- a/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
 +++ b/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
-@@ -800,7 +800,7 @@ void PermissionsAiUiSelector::ExecuteOnD
+@@ -812,7 +812,7 @@ void PermissionsAiUiSelector::ExecuteOnD
      ModelExecutionData model_data) {
    VLOG(1) << "[PermissionsAI] ExecuteOnDeviceAivXModel";
    PredictionModelHandlerProvider* prediction_model_handler_provider =
@@ -604,7 +619,7 @@
        "//chrome/browser/sharing_hub",
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1671,9 +1671,6 @@ void RegisterLocalState(PrefRegistrySimp
+@@ -1687,9 +1687,6 @@ void RegisterLocalState(PrefRegistrySimp
    DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
  #endif
  
@@ -616,7 +631,7 @@
    PlatformAuthPolicyObserver::RegisterPrefs(registry);
 --- a/chrome/browser/profiles/BUILD.gn
 +++ b/chrome/browser/profiles/BUILD.gn
-@@ -806,7 +806,6 @@ source_set("profiles_extra_parts_impl")
+@@ -908,7 +908,6 @@ source_set("profiles_extra_parts_impl")
    } else {
      deps += [
        "//chrome/browser/accessibility/phrase_segmentation",
@@ -624,7 +639,7 @@
        "//chrome/browser/accessibility_annotator/content_annotator",
        "//chrome/browser/apps/app_service",
        "//chrome/browser/autofill",
-@@ -822,7 +821,6 @@ source_set("profiles_extra_parts_impl")
+@@ -924,7 +923,6 @@ source_set("profiles_extra_parts_impl")
        "//chrome/browser/profile_resetter",
        "//chrome/browser/record_replay",
        "//chrome/browser/record_replay:impl",
@@ -634,7 +649,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
-@@ -130,7 +130,6 @@
+@@ -135,7 +135,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"
@@ -642,7 +657,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"
-@@ -391,7 +390,6 @@
+@@ -396,7 +395,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"
@@ -650,7 +665,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"
-@@ -1208,7 +1206,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1204,7 +1202,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
    net::ServerCertificateDatabaseServiceFactory::GetInstance();
  #endif
@@ -668,7 +683,7 @@
    OptimizationGuideGlobalStateHolderKeyedServiceFactory::GetInstance();
    OptimizationGuideKeyedServiceFactory::GetInstance();
    OriginKeyedPermissionActionServiceFactory::GetInstance();
-@@ -1360,7 +1354,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1361,7 +1355,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
    policy::UserPolicyOidcSigninServiceFactory::GetInstance();
  #endif
@@ -687,7 +702,7 @@
  #endif
  #if BUILDFLAG(IS_CHROMEOS)
    if (ash::features::IsScannerEnabled()) {
-@@ -1574,7 +1563,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1575,7 +1564,6 @@ void ChromeBrowserMainExtraPartsProfiles
    TopSitesFactory::GetInstance();
    translate::TranslateRankerFactory::GetInstance();
  #if !BUILDFLAG(IS_ANDROID)
@@ -711,7 +726,7 @@
    // System Profile.
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -919,11 +919,6 @@ void ProfileImpl::DoFinalInit(CreateMode
+@@ -921,11 +921,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);
@@ -758,7 +773,7 @@
  ${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
 --- a/chrome/browser/skills/BUILD.gn
 +++ b/chrome/browser/skills/BUILD.gn
-@@ -60,13 +60,9 @@ source_set("public") {
+@@ -61,13 +61,9 @@ source_set("public") {
  source_set("ui") {
    sources = [
      "skills_dialog_launcher.cc",
@@ -774,25 +789,16 @@
    }
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -1758,8 +1758,6 @@ static_library("ui") {
+@@ -1449,7 +1449,6 @@ static_library("ui") {
        "//chrome/browser/regional_capabilities",
        "//chrome/browser/safe_browsing",
        "//chrome/browser/safe_browsing:advanced_protection",
--      "//chrome/browser/screen_ai:screen_ai_install_state",
 -      "//chrome/browser/screen_ai:screen_ai_service_router_factory",
        "//chrome/browser/smart_card",
        "//chrome/browser/support_tool",
        "//chrome/browser/tab_group_sync:utils",
-@@ -2639,7 +2637,6 @@ static_library("ui") {
-       "//chrome/browser/policy:onc",
-       "//chrome/browser/policy:system_features_disable_list",
-       "//chrome/browser/push_notification",
--      "//chrome/browser/screen_ai/public:optical_character_recognizer",
-       "//chrome/browser/ui/ash/app_access",
-       "//chrome/browser/ui/ash/arc",
-       "//chrome/browser/ui/ash/arc/arc_app_dialog_view",
-@@ -4506,7 +4503,6 @@ static_library("ui") {
-       "//chrome/browser/ui/waap:waap_utils",
+@@ -3093,7 +3092,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",
@@ -854,7 +860,7 @@
                            const std::u16string& text);
 --- a/chrome/browser/ui/tabs/public/tab_features.h
 +++ b/chrome/browser/ui/tabs/public/tab_features.h
-@@ -127,12 +127,6 @@ namespace permissions {
+@@ -157,12 +157,6 @@ namespace permissions {
  class PermissionIndicatorsTabData;
  }  // namespace permissions
  
@@ -867,7 +873,7 @@
  namespace sync_sessions {
  class SyncSessionsRouterTabHelper;
  }  // namespace sync_sessions
-@@ -600,10 +594,6 @@ class TabFeatures {
+@@ -654,10 +648,6 @@ class TabFeatures {
    std::unique_ptr<contextual_tasks::ContextualTasksTabVisitTracker>
        contextual_tasks_tab_visit_tracker_;
  
@@ -880,7 +886,7 @@
    std::unique_ptr<enterprise_reporting::SaasUsageNavigationObserver>
 --- a/chrome/browser/ui/tabs/tab_features.cc
 +++ b/chrome/browser/ui/tabs/tab_features.cc
-@@ -409,11 +409,6 @@ void TabFeatures::Init(TabInterface& tab
+@@ -400,11 +400,6 @@ void TabFeatures::Init(TabInterface& tab
            GetUserDataFactory().CreateInstance<actor::ui::ActorUiTabController>(
                tab, tab, actor::ActorKeyedService::Get(profile));
      }
@@ -892,7 +898,7 @@
  
      if (accessibility_annotator::
              ContentAnnotatorService* content_annotator_service =
-@@ -648,10 +643,6 @@ void TabFeatures::Init(TabInterface& tab
+@@ -664,10 +659,6 @@ void TabFeatures::Init(TabInterface& tab
    }
  #endif
  
@@ -905,7 +911,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
-@@ -1016,40 +1016,6 @@ void MaybeRegisterChromeFeaturePromos(
+@@ -1008,40 +1008,6 @@ void MaybeRegisterChromeFeaturePromos(
                         "Triggered when the PDF Viewer opens.")));
  #endif  // BUILDFLAG(ENABLE_PDF_INK2)
  
@@ -936,7 +942,7 @@
 -                for (auto* contents_web_view : contents_web_views) {
 -                  auto* pdf_doc_helper =
 -                      pdf::PDFDocumentHelper::MaybeGetForWebContents(
--                          contents_web_view->GetWebContents());
+-                          *contents_web_view->GetWebContents());
 -                  if (pdf_doc_helper && pdf_doc_helper->SearchifyStarted()) {
 -                    return elements[0];
 -                  }
@@ -948,7 +954,7 @@
    registry.RegisterFeature(std::move(
 --- a/chrome/browser/ui/webui/BUILD.gn
 +++ b/chrome/browser/ui/webui/BUILD.gn
-@@ -121,7 +121,6 @@ source_set("configs") {
+@@ -125,7 +125,6 @@ source_set("configs") {
        "//chrome/browser/glic/selection",
        "//chrome/browser/ui/webui/access_code_cast",
        "//chrome/browser/ui/webui/app_service_internals",
@@ -958,7 +964,7 @@
        "//chrome/browser/ui/webui/data_sharing",
 --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
-@@ -340,7 +340,6 @@ void RegisterChromeWebUIConfigs() {
+@@ -343,7 +343,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>());
@@ -968,15 +974,15 @@
    map.AddWebUIConfig(std::make_unique<ColorPipelineInternalsUIConfig>());
 --- a/chrome/browser/ui/webui/settings/BUILD.gn
 +++ b/chrome/browser/ui/webui/settings/BUILD.gn
-@@ -62,7 +62,6 @@ source_set("settings") {
-     "//chrome/browser/privacy_sandbox:countries",
+@@ -60,7 +60,6 @@ source_set("settings") {
+     "//chrome/browser/permissions/system",
      "//chrome/browser/profile_resetter",
      "//chrome/browser/profiles:profile",
 -    "//chrome/browser/screen_ai:screen_ai_install_state",
      "//chrome/browser/themes",
      "//chrome/browser/ui/safety_hub",
      "//chrome/browser/ui/search_engines",
-@@ -653,7 +652,6 @@ if (!is_android) {
+@@ -661,7 +660,6 @@ if (!is_android) {
        ]
        deps += [
          "//chrome/browser/profiles",
@@ -1104,7 +1110,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"
-@@ -410,14 +408,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
+@@ -422,14 +420,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
    prefs_lang = language::ExtractBaseLanguage(prefs_lang);
    SetDefaultLanguageCode(prefs_lang);
  
@@ -1121,7 +1127,7 @@
        !features::IsReadAnythingReadAloudPhraseHighlightingEnabled()) {
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -329,8 +329,6 @@ static_library("renderer") {
+@@ -340,8 +340,6 @@ static_library("renderer") {
      deps += [ "//chrome/common/wallet:mojo_bindings" ]
    } else {
      sources += [
@@ -1130,7 +1136,7 @@
        "accessibility/phrase_segmentation/base_phrase_segmenter.cc",
        "accessibility/phrase_segmentation/base_phrase_segmenter.h",
        "accessibility/phrase_segmentation/dependency_parser_model.cc",
-@@ -347,16 +345,6 @@ static_library("renderer") {
+@@ -358,16 +356,6 @@ static_library("renderer") {
        "accessibility/phrase_segmentation/tokenized_sentence.h",
        "accessibility/phrase_segmentation/tokenizer.cc",
        "accessibility/phrase_segmentation/tokenizer.h",
@@ -1147,7 +1153,7 @@
        "media/chrome_speech_recognition_client.cc",
        "media/chrome_speech_recognition_client.h",
        "password_manager/remote_actor_credential_sharing_extension.cc",
-@@ -374,7 +362,6 @@ static_library("renderer") {
+@@ -385,7 +373,6 @@ static_library("renderer") {
        "//components/record_replay/content/renderer",
        "//components/trusted_vault",
        "//services/screen_ai/buildflags",
@@ -1182,7 +1188,7 @@
    guest_view::SlimWebViewBindings::MaybeInstall(*render_frame());
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -2251,9 +2251,6 @@ if (!is_android) {
+@@ -2159,9 +2159,6 @@ if (!is_android) {
        "//chrome/browser/safe_browsing:advanced_protection",
        "//chrome/browser/safe_browsing:blocking_page_platform_test_support",
        "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
@@ -1192,7 +1198,7 @@
        "//chrome/browser/search",
        "//chrome/browser/search:browser_tests",
        "//chrome/browser/search:test_support",
-@@ -2821,8 +2818,6 @@ if (!is_android) {
+@@ -2752,8 +2749,6 @@ if (!is_android) {
        "//services/preferences/public/cpp",
        "//services/preferences/public/cpp/tracked",
        "//services/preferences/tracked:features",
@@ -1201,7 +1207,7 @@
        "//services/service_manager/public/cpp",
        "//services/strings",
        "//services/test/echo/public/mojom",
-@@ -6709,7 +6704,6 @@ test("unit_tests") {
+@@ -6630,7 +6625,6 @@ test("unit_tests") {
      # TODO(crbug.com/417513088): Maybe merge with the non-android `deps`
      # declaration above?
      deps += [
@@ -1209,7 +1215,7 @@
        "//chrome:packed_resources",
        "//chrome/browser/apps:icon_standardizer",
        "//chrome/browser/apps/app_service",
-@@ -6749,7 +6743,6 @@ test("unit_tests") {
+@@ -6672,7 +6666,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",
@@ -1249,7 +1255,7 @@
  #endif
  
  #if (BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION) && \
-@@ -492,7 +486,6 @@ void RegisterMainThreadServices(mojo::Se
+@@ -496,7 +490,6 @@ void RegisterMainThreadServices(mojo::Se
    services.Add(RunProfileImporter);
    services.Add(RunMirroringService);
    services.Add(RunReadingModeMetricsService);
@@ -1259,7 +1265,7 @@
  #if BUILDFLAG(ENABLE_MEDIA_REMOTING_REDIRECTION)
 --- a/components/BUILD.gn
 +++ b/components/BUILD.gn
-@@ -649,7 +649,6 @@ test("components_unittests") {
+@@ -647,7 +647,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",
@@ -1269,7 +1275,7 @@
        "//components/security_interstitials/content:unit_tests",
 --- a/components/autofill/core/browser/foundations/autofill_manager.cc
 +++ b/components/autofill/core/browser/foundations/autofill_manager.cc
-@@ -162,8 +162,6 @@ struct AutofillManager::AsyncContext {
+@@ -164,8 +164,6 @@ struct AutofillManager::AsyncContext {
  
    std::vector<FormData> forms;
    std::vector<RegexPredictions> regex_predictions;
@@ -1278,7 +1284,7 @@
    GeoIpCountryCode country_code;
    LanguageCode current_page_language;
    std::unique_ptr<BufferingLogManager> log_manager;
-@@ -889,10 +887,8 @@ void AutofillManager::RunMlModels(
+@@ -920,10 +918,8 @@ void AutofillManager::RunMlModels(
                                     }));
          switch (source) {
            case HeuristicSource::kAutofillMachineLearning:
@@ -1289,7 +1295,7 @@
              break;
            case HeuristicSource::kRegexes:
              NOTREACHED();
-@@ -1101,12 +1097,6 @@ void AutofillManager::UpdateFormCache(
+@@ -1137,12 +1133,6 @@ void AutofillManager::UpdateFormCache(
  
    auto apply_predictions = [](FormStructure& form_structure,
                                const AsyncContext& context, size_t i) {
@@ -1302,7 +1308,7 @@
      if (!context.regex_predictions.empty()) {
        context.regex_predictions[i].ApplyTo(form_structure.fields());
      }
-@@ -1200,26 +1190,6 @@ void AutofillManager::LogCurrentFieldTyp
+@@ -1236,26 +1226,6 @@ void AutofillManager::LogCurrentFieldTyp
  
  void AutofillManager::SubscribeToMlModelChanges(
      FieldClassificationModelHandler& handler) {

diff --git a/sources b/sources
index 8ee19be..9446546 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (node-v22.22.0-stripped.tar.gz) = f32a8a73063b3c78cbacf941e11dd529ebcf2618b3ba661966312e49ee9870c43a3acf256e8d331a4b0b621b16a501810c02a3ad763c75884cc250addca8e106
-SHA512 (chromium-152.0.7977.82-clean.tar.xz) = a944cd30b2fe3f862834c2370ace82dd3192cbc60e1ba4e1581c551db43b852e959b390331990f2dd3674142733dd37694289b39eae614d2d41bf2b59fbd6c8a
+SHA512 (chromium-153.0.8010.36-clean.tar.xz) = c4bf5cbdc8a3d95d607f98b48ab3f22a11c5d21206dab190721423da68bdf485179d979ec3d25c72ebe6b97aef24c69b456d3be7ec5d2d19806a5fc71ef13542

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-16 14:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-16 14:35 [rpms/chromium] epel10.2: Update to 153.0.8010.36 Than Ngo

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