public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/chromium] f43: - security release 151.0.7922.71 includes 370 security fixes
@ 2026-07-30 13:15 Than Ngo
  0 siblings, 0 replies; only message in thread
From: Than Ngo @ 2026-07-30 13:15 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/chromium
            Branch : f43
            Commit : 8b10c18f9dccb9d12318272da064effe14f3e074
            Author : Than Ngo <than@redhat.com>
            Date   : 2026-07-30T09:28:45+02:00
            Stats  : +17995/-15814 in 21 file(s)
            URL    : https://src.fedoraproject.org/rpms/chromium/c/8b10c18f9dccb9d12318272da064effe14f3e074?branch=f43

            Log:
            - security release 151.0.7922.71 includes 370 security fixes
  * CVE-2026-17650: Use after free in Compositing
  * CVE-2026-17651: Insufficient validation of untrusted input in Dawn
  * CVE-2026-17652: Use after free in Views
  * CVE-2026-17653: Use after free in Skia
  * CVE-2026-17654: Race in Updater
  * CVE-2026-17655: Insufficient validation of untrusted input in ANGLE
  * CVE-2026-17656: Use after free in Ozone
  * CVE-2026-17657: Use after free in Navigation
  * CVE-2026-17658: Use after free in V8
  * CVE-2026-17659: Inappropriate implementation in SiteIsolation
  * CVE-2026-17660: Insufficient validation of untrusted input in Network
  * CVE-2026-17661: Use after free in Loader
  * CVE-2026-17662: Insufficient policy enforcement in Prefetch
  * CVE-2026-17663: Insufficient validation of untrusted input in GPU
  * CVE-2026-17664: Insufficient validation of untrusted input in Loader
  * CVE-2026-17665: Use after free in V8
  * CVE-2026-17666: Cryptographic Flaw in Enterprise
  * CVE-2026-17667: Uninitialized Use in ANGLE
  * CVE-2026-17668: Uninitialized Use in ANGLE
  * CVE-2026-17669: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17670: Use after free in Views
  * CVE-2026-17671: Insufficient validation of untrusted input in ANGLE
  * CVE-2026-17672: Insufficient validation of untrusted input in Chromecast
  * CVE-2026-17673: Integer overflow in QUIC
  * CVE-2026-17674: Inappropriate implementation in HTML
  * CVE-2026-17675: Out of bounds write in ANGLE
  * CVE-2026-17676: Inappropriate implementation in ANGLE
  * CVE-2026-17677: Inappropriate implementation in ANGLE
  * CVE-2026-17678: Out of bounds read in ANGLE
  * CVE-2026-17679: Insufficient validation of untrusted input in Print Preview
  * CVE-2026-17680: Heap buffer overflow in Color
  * CVE-2026-17681: Insufficient validation of untrusted input in Web Authentication
  * CVE-2026-17682: Integer overflow in ANGLE
  * CVE-2026-17683: Inappropriate implementation in ANGLE
  * CVE-2026-17684: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-17685: Use after free in Autofill
  * CVE-2026-17686: Insufficient validation of untrusted input in Passwords
  * CVE-2026-17687: Type Confusion in ANGLE
  * CVE-2026-17688: Use after free in Input
  * CVE-2026-17689: Uninitialized Use in ANGLE
  * CVE-2026-17690: Insufficient validation of untrusted input in PDF
  * CVE-2026-17691: Out of bounds write in ANGLE
  * CVE-2026-17692: Use after free in DataTransfer
  * CVE-2026-17693: Inappropriate implementation in FileSystem
  * CVE-2026-17694: Use after free in DOM
  * CVE-2026-17695: Inappropriate implementation in ANGLE
  * CVE-2026-17696: Side-channel information leakage in Media
  * CVE-2026-17697: Type Confusion in ANGLE
  * CVE-2026-17698: Insufficient validation of untrusted input in UI
  * CVE-2026-17699: Use after free in Views
  * CVE-2026-17700: Insufficient validation of untrusted input in Actor
  * CVE-2026-17701: Out of bounds read in ANGLE
  * CVE-2026-17702: Inappropriate implementation in Skia
  * CVE-2026-17703: Policy bypass in Chrome for iOS
  * CVE-2026-17704: Use after free in ANGLE
  * CVE-2026-17705: Integer overflow in libxml
  * CVE-2026-17706: Insufficient validation of untrusted input in Media
  * CVE-2026-17707: Uninitialized Use in Media
  * CVE-2026-17708: Use after free in Audio
  * CVE-2026-17709: Race in Downloads
  * CVE-2026-17710: Inappropriate implementation in MHTML
  * CVE-2026-17711: Race in Downloads
  * CVE-2026-17712: Race in Skia
  * CVE-2026-17713: Insufficient validation of untrusted input in Accessibility
  * CVE-2026-17714: Uninitialized Use in ANGLE
  * CVE-2026-17715: Inappropriate implementation in Passwords
  * CVE-2026-17716: Use after free in Updater
  * CVE-2026-17717: Integer overflow in ANGLE
  * CVE-2026-17718: Use after free in ANGLE
  * CVE-2026-17719: Use after free in Input
  * CVE-2026-17720: Insufficient policy enforcement in Passwords
  * CVE-2026-17721: Out of bounds write in ANGLE
  * CVE-2026-17722: Object lifecycle issue in WebView
  * CVE-2026-17723: Use after free in Media
  * CVE-2026-17724: Race in Chrome for iOS
  * CVE-2026-17725: Type Confusion in V8
  * CVE-2026-17726: Integer overflow in WebGL
  * CVE-2026-17727: Out of bounds write in WebGL
  * CVE-2026-17728: Inappropriate implementation in Extensions
  * CVE-2026-17758: Heap buffer overflow in Dawn
  * CVE-2026-17732: Inappropriate implementation in SVG
  * CVE-2026-17729: Use after free in V8
  * CVE-2026-17730: Side-channel information leakage in Autofill
  * CVE-2026-17731: Inappropriate implementation in Autofill
  * CVE-2026-17733: Inappropriate implementation in QUIC
  * CVE-2026-17734: Inappropriate implementation in Autofill
  * CVE-2026-17735: Insufficient validation of untrusted input in BFCache
  * CVE-2026-17736: Insufficient validation of untrusted input in WebView
  * CVE-2026-17737: Use after free in Bluetooth
  * CVE-2026-17738: Insufficient validation of untrusted input in Payments
  * CVE-2026-17739: Insufficient policy enforcement in Extensions
  * CVE-2026-17740: Uninitialized Use in ANGLE
  * CVE-2026-17741: Insufficient validation of untrusted input in WebView
  * CVE-2026-17742: Insufficient policy enforcement in Payments
  * CVE-2026-17743: Insufficient policy enforcement in ControlledFrame
  * CVE-2026-17744: Inappropriate implementation in File Input
  * CVE-2026-17745: Out of bounds read in Skia
  * CVE-2026-17746: Use after free in GPU
  * CVE-2026-17747: Insufficient validation of untrusted input in Payments
  * CVE-2026-17748: Inappropriate implementation in Extensions
  * CVE-2026-17749: Insufficient validation of untrusted input in Extensions
  * CVE-2026-17750: Use after free in ANGLE
  * CVE-2026-17751: Inappropriate implementation in AdFilter
  * CVE-2026-17752: Use after free in Views
  * CVE-2026-17753: Inappropriate implementation in Autofill
  * CVE-2026-17754: Inappropriate implementation in Blink
  * CVE-2026-17755: Incorrect security UI in Extensions
  * CVE-2026-17756: Insufficient policy enforcement in Presentation
  * CVE-2026-17757: Uninitialized Use in Skia
  * CVE-2026-17759: Uninitialized Use in Codecs
  * CVE-2026-17760: Side-channel information leakage in NoStatePrefetch
  * CVE-2026-17761: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-17762: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17763: Inappropriate implementation in GPU
  * CVE-2026-17764: Inappropriate implementation in FedCM
  * CVE-2026-17765: Inappropriate implementation in WebProtect
  * CVE-2026-17766: Insufficient validation of untrusted input in Clipboard
  * CVE-2026-17767: Insufficient validation of untrusted input in WebView
  * CVE-2026-17768: Insufficient validation of untrusted input in WebSockets
  * CVE-2026-17769: Insufficient validation of untrusted input in Cast
  * CVE-2026-17770: Out of bounds read in Media
  * CVE-2026-17771: Uninitialized Use in Skia
  * CVE-2026-17772: Out of bounds read in WebGL
  * CVE-2026-17773: Insufficient validation of untrusted input in Cast
  * CVE-2026-17774: Insufficient validation of untrusted input in Variations
  * CVE-2026-17775: Inappropriate implementation in PresentationAPI
  * CVE-2026-17776: Policy bypass in Receiver
  * CVE-2026-17777: Inappropriate implementation in Autofill
  * CVE-2026-17778: Use after free in Extensions
  * CVE-2026-17779: Inappropriate implementation in Site Isolation
  * CVE-2026-17780: Inappropriate implementation in Isolated Web Apps
  * CVE-2026-17781: Inappropriate implementation in Extensions
  * CVE-2026-17782: Incorrect security UI in Chrome for iOS
  * CVE-2026-17783: Inappropriate implementation in Loader
  * CVE-2026-17784: Use after free in Audio
  * CVE-2026-17785: Uninitialized Use in ANGLE
  * CVE-2026-17786: Insufficient validation of untrusted input in DevTools
  * CVE-2026-17787: Inappropriate implementation in DevTools
  * CVE-2026-17788: Inappropriate implementation in Blink
  * CVE-2026-17789: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-17790: Uninitialized Use in ANGLE
  * CVE-2026-17791: Insufficient validation of untrusted input in Payments
  * CVE-2026-17792: Inappropriate implementation in Credential Management
  * CVE-2026-17793: Inappropriate implementation in Messages
  * CVE-2026-17794: Insufficient validation of untrusted input in Mobile
  * CVE-2026-17795: Insufficient validation of untrusted input in GetUserMedia
  * CVE-2026-17796: Side-channel information leakage in WebXR
  * CVE-2026-17797: Inappropriate implementation in CSS
  * CVE-2026-17798: Inappropriate implementation in Cast
  * CVE-2026-17799: Insufficient validation of untrusted input in Safe Browsing
  * CVE-2026-17800: Side-channel information leakage in MediaRecording
  * CVE-2026-17801: Out of bounds memory access in ANGLE
  * CVE-2026-17802: Side-channel information leakage in GPU
  * CVE-2026-17803: Insufficient validation of untrusted input in Save to Drive
  * CVE-2026-17804: Use after free in Media
  * CVE-2026-17805: Insufficient policy enforcement in Glic
  * CVE-2026-17806: Insufficient validation of untrusted input in Extensions
  * CVE-2026-17807: Use after free in V8
  * CVE-2026-17808: Uninitialized Use in WebGL
  * CVE-2026-17809: Insufficient validation of untrusted input in Extensions
  * CVE-2026-17810: Uninitialized Use in Dawn
  * CVE-2026-17811: Use after free in ANGLE
  * CVE-2026-17812: Inappropriate implementation in DigitalCredentials
  * CVE-2026-17813: Insufficient policy enforcement in Chrome for iOS
  * CVE-2026-17814: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-17815: Insufficient policy enforcement in GuestView
  * CVE-2026-17816: Inappropriate implementation in Speech
  * CVE-2026-17817: Inappropriate implementation in ReportingAndNEL
  * CVE-2026-17818: Inappropriate implementation in Network
  * CVE-2026-17819: Inappropriate implementation in WebAppInstalls
  * CVE-2026-17820: Insufficient policy enforcement in Autofill
  * CVE-2026-17821: Insufficient policy enforcement in Extensions
  * CVE-2026-17822: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17823: Insufficient policy enforcement in WebXR
  * CVE-2026-17824: Insufficient policy enforcement in ServiceWorker
  * CVE-2026-17825: Insufficient policy enforcement in Passwords
  * CVE-2026-17826: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17827: Inappropriate implementation in CSS
  * CVE-2026-17828: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17829: Insufficient policy enforcement in Passwords
  * CVE-2026-17830: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17831: Insufficient validation of untrusted input in Passwords
  * CVE-2026-17832: Use after free in ANGLE
  * CVE-2026-17833: Inappropriate implementation in Passwords
  * CVE-2026-17834: Inappropriate implementation in Passwords
  * CVE-2026-17835: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17836: Use after free in V8
  * CVE-2026-17837: Insufficient validation of untrusted input in DevTools
  * CVE-2026-17838: Incorrect security UI in Chrome for iOS
  * CVE-2026-17839: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17840: Incorrect security UI in Passwords
  * CVE-2026-17841: Race in Chrome for iOS
  * CVE-2026-17842: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17843: Inappropriate implementation in CSS
  * CVE-2026-17844: Insufficient validation of untrusted input in Cast
  * CVE-2026-17845: Inappropriate implementation in CSS
  * CVE-2026-17846: Inappropriate implementation in Media
  * CVE-2026-17847: Insufficient validation of untrusted input in ANGLE
  * CVE-2026-17848: Insufficient validation of untrusted input in Codecs
  * CVE-2026-17849: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17850: Inappropriate implementation in Permissions
  * CVE-2026-17851: Side-channel information leakage in Autofill
  * CVE-2026-17852: Inappropriate implementation in Media Router
  * CVE-2026-17853: Inappropriate implementation in DevTools
  * CVE-2026-17854: Insufficient policy enforcement in WebMCP
  * CVE-2026-17855: Race in DevTools
  * CVE-2026-17856: Inappropriate implementation in Network
  * CVE-2026-17857: Inappropriate implementation in Network
  * CVE-2026-17858: Uninitialized Use in WebNN
  * CVE-2026-17859: Side-channel information leakage in Favicons
  * CVE-2026-17860: Insufficient validation of untrusted input in Mobile
  * CVE-2026-17861: Insufficient validation of untrusted input in Updater
  * CVE-2026-17862: Use after free in Tracing
  * CVE-2026-17863: Inappropriate implementation in Browser
  * CVE-2026-17864: Inappropriate implementation in Updater
  * CVE-2026-17865: Inappropriate implementation in Crypto
  * CVE-2026-17866: Type Confusion in Tab
  * CVE-2026-17867: Insufficient validation of untrusted input in Dawn
  * CVE-2026-17868: Insufficient policy enforcement in USB
  * CVE-2026-17869: Out of bounds read in WebXR
  * CVE-2026-17870: Insufficient validation of untrusted input in Cast
  * CVE-2026-17871: Inappropriate implementation in Passwords
  * CVE-2026-17872: Cryptographic Flaw in WebAppInstalls
  * CVE-2026-17873: Insufficient policy enforcement in Chrome for iOS
  * CVE-2026-17874: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17875: Use after free in PDFium
  * CVE-2026-17876: Inappropriate implementation in Payments
  * CVE-2026-17877: Inappropriate implementation in Chromoting
  * CVE-2026-17878: Inappropriate implementation in CSS
  * CVE-2026-17879: Inappropriate implementation in Autofill
  * CVE-2026-17880: Inappropriate implementation in Autofill
  * CVE-2026-17881: Use after free in WebXR
  * CVE-2026-17882: Policy bypass in Extensions
  * CVE-2026-17883: Inappropriate implementation in Headless
  * CVE-2026-17884: Object lifecycle issue in WebRTC
  * CVE-2026-17885: Inappropriate implementation in Paint
  * CVE-2026-17886: Use after free in Enterprise
  * CVE-2026-17887: Use after free in TabStrip
  * CVE-2026-17888: Insufficient validation of untrusted input in WebUI
  * CVE-2026-17889: Uninitialized Use in WebXR
  * CVE-2026-17890: Insufficient validation of untrusted input in DevTools
  * CVE-2026-17891: Use after free in ANGLE
  * CVE-2026-17892: Inappropriate implementation in WebXR
  * CVE-2026-17893: Insufficient validation of untrusted input in Updater
  * CVE-2026-17894: Use after free in Views
  * CVE-2026-17895: Inappropriate implementation in DataTransfer
  * CVE-2026-17896: Use after free in DevTools
  * CVE-2026-17897: Inappropriate implementation in ORB
  * CVE-2026-17898: Use after free in DevTools
  * CVE-2026-17899: Insufficient policy enforcement in DevTools
  * CVE-2026-17900: Inappropriate implementation in Enterprise
  * CVE-2026-17901: Inappropriate implementation in Sharing
  * CVE-2026-17902: Inappropriate implementation in Editing
  * CVE-2026-17903: Insufficient policy enforcement in Chromecast
  * CVE-2026-17904: Insufficient policy enforcement in NFC
  * CVE-2026-17905: Inappropriate implementation in SurfaceCapture
  * CVE-2026-17906: Insufficient validation of untrusted input in Bluetooth
  * CVE-2026-17907: Side-channel information leakage in Network
  * CVE-2026-17908: Insufficient validation of untrusted input in Printing
  * CVE-2026-17909: Insufficient validation of untrusted input in Isolated Web Apps
  * CVE-2026-17910: Insufficient policy enforcement in NFC
  * CVE-2026-17911: Insufficient policy enforcement in SVG
  * CVE-2026-17912: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17913: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17914: Side-channel information leakage in Skia
  * CVE-2026-17915: Inappropriate implementation in WebView
  * CVE-2026-17916: Insufficient policy enforcement in Settings
  * CVE-2026-17917: Policy bypass in Chrome for iOS
  * CVE-2026-17918: Use after free in Sync
  * CVE-2026-17919: Insufficient policy enforcement in Enterprise
  * CVE-2026-17920: Use after free in V8
  * CVE-2026-17921: Insufficient validation of untrusted input in Navigation
  * CVE-2026-17922: Inappropriate implementation in Enterprise
  * CVE-2026-17923: Policy bypass in Enterprise
  * CVE-2026-17924: Use after free in DNS
  * CVE-2026-17925: Inappropriate implementation in Cast
  * CVE-2026-17926: Insufficient validation of untrusted input in DevTools
  * CVE-2026-17927: Insufficient policy enforcement in DevTools
  * CVE-2026-17928: Inappropriate implementation in DataTransfer
  * CVE-2026-17929: Insufficient validation of untrusted input in DevTools
  * CVE-2026-17930: Insufficient validation of untrusted input in Extensions
  * CVE-2026-17931: Inappropriate implementation in DevTools
  * CVE-2026-17932: Use after free in DataTransfer
  * CVE-2026-17933: Inappropriate implementation in DOMStorage
  * CVE-2026-17934: Insufficient validation of untrusted input in DevTools
  * CVE-2026-17935: Heap buffer overflow in Codecs
  * CVE-2026-17936: Inappropriate implementation in DevTools
  * CVE-2026-17937: Inappropriate implementation in DevTools
  * CVE-2026-17938: Inappropriate implementation in FullScreen
  * CVE-2026-17939: Inappropriate implementation in Passwords
  * CVE-2026-17940: Insufficient validation of untrusted input in Picture-in-Picture
  * CVE-2026-17941: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17942: Side-channel information leakage in SVG
  * CVE-2026-17943: Inappropriate implementation in Parser
  * CVE-2026-17944: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17945: Inappropriate implementation in Navigation
  * CVE-2026-17946: Uninitialized Use in Dawn
  * CVE-2026-17947: Use after free in WebSockets
  * CVE-2026-17948: Type Confusion in V8
  * CVE-2026-17949: Uninitialized Use in GPU
  * CVE-2026-17950: Policy bypass in Safebrowsing
  * CVE-2026-17951: Heap buffer overflow in WebRTC
  * CVE-2026-17952: Inappropriate implementation in V8
  * CVE-2026-17953: Insufficient policy enforcement in WebView
  * CVE-2026-17954: Policy bypass in MHTML
  * CVE-2026-17955: Insufficient validation of untrusted input in Payments
  * CVE-2026-17956: Inappropriate implementation in Scheduling
  * CVE-2026-17957: Inappropriate implementation in CORS
  * CVE-2026-17958: Inappropriate implementation in Views
  * CVE-2026-17959: Inappropriate implementation in Network
  * CVE-2026-17960: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17961: Inappropriate implementation in Session
  * CVE-2026-17962: Inappropriate implementation in Blink
  * CVE-2026-17963: Inappropriate implementation in SVG
  * CVE-2026-17964: Incorrect security UI in UI
  * CVE-2026-17965: Incorrect security UI in Chrome for iOS
  * CVE-2026-17966: Inappropriate implementation in Views
  * CVE-2026-17967: Use after free in Chrome for iOS
  * CVE-2026-17968: Uninitialized Use in WebXR
  * CVE-2026-17969: Inappropriate implementation in Passwords
  * CVE-2026-17970: Insufficient validation of untrusted input in Passwords
  * CVE-2026-17971: Inappropriate implementation in Frame
  * CVE-2026-17972: Inappropriate implementation in Chrome for iOS
  * CVE-2026-17973: Inappropriate implementation in Views
  * CVE-2026-17974: Insufficient policy enforcement in DevTools
  * CVE-2026-17975: Inappropriate implementation in IME
  * CVE-2026-17976: Policy bypass in Extensions
  * CVE-2026-17977: Policy bypass in CSS
  * CVE-2026-17978: Side-channel information leakage in WebCodecs
  * CVE-2026-17979: Race in V8
  * CVE-2026-17980: Inappropriate implementation in UI
  * CVE-2026-17981: Inappropriate implementation in Blink
  * CVE-2026-17982: Insufficient validation of untrusted input in Cast
  * CVE-2026-17983: Incorrect security UI in Global Media Controls
  * CVE-2026-17984: Inappropriate implementation in Browser
  * CVE-2026-17985: Insufficient policy enforcement in Speech
  * CVE-2026-17986: Insufficient policy enforcement in Bluetooth
  * CVE-2026-17987: Insufficient validation of untrusted input in Notifications
  * CVE-2026-17988: Insufficient validation of untrusted input in Navigation
  * CVE-2026-17989: Type Confusion in V8
  * CVE-2026-17990: Insufficient validation of untrusted input in WebAuthn
  * CVE-2026-17991: Insufficient validation of untrusted input in AI
  * CVE-2026-17992: Uninitialized Use in Skia
  * CVE-2026-17993: Race in Updater
  * CVE-2026-17994: Inappropriate implementation in Media
  * CVE-2026-17995: Out of bounds read in Dawn
  * CVE-2026-17996: Inappropriate implementation in Browser
  * CVE-2026-17997: Inappropriate implementation in Passwords
  * CVE-2026-17998: Incorrect security UI in Extensions
  * CVE-2026-17999: Incorrect security UI in PictureInPicture
  * CVE-2026-18000: Insufficient policy enforcement in USB
  * CVE-2026-18001: Inappropriate implementation in WebGL
  * CVE-2026-18002: Insufficient validation of untrusted input in Google Lens
  * CVE-2026-18003: Inappropriate implementation in Chrome for iOS
  * CVE-2026-18004: Insufficient policy enforcement in Speech
  * CVE-2026-18005: Inappropriate implementation in WebXR
  * CVE-2026-18006: Inappropriate implementation in Google Lens
  * CVE-2026-18007: Inappropriate implementation in Input
  * CVE-2026-18008: Inappropriate implementation in Settings
  * CVE-2026-18009: Insufficient validation of untrusted input in Passwords
  * CVE-2026-18010: Inappropriate implementation in Passwords
  * CVE-2026-18011: Inappropriate implementation in Chrome for iOS
  * CVE-2026-18012: Use after free in PDFium
  * CVE-2026-18013: Inappropriate implementation in Chrome for iOS
  * CVE-2026-18014: Insufficient validation of untrusted input in DevTools
  * CVE-2026-18015: Inappropriate implementation in Tint
  * CVE-2026-18016: Insufficient policy enforcement in Chrome for iOS
  * CVE-2026-18017: Use after free in Dawn
  * CVE-2026-18018: Inappropriate implementation in Updater
  * CVE-2026-18019: Side-channel information leakage in Media
- Refresh patches
- Remove bundle golang and replace it with system golang
- Fix build error caused by unresolve dependency histogram_xml
- Fix unknown warning options which are not supported in old clang version
- Drop patches which are merged in upstream

---
diff --git a/0001-Add-PPC64-support-for-boringssl.patch b/0001-Add-PPC64-support-for-boringssl.patch
index eb09a3f..465beb8 100644
--- a/0001-Add-PPC64-support-for-boringssl.patch
+++ b/0001-Add-PPC64-support-for-boringssl.patch
@@ -1,7 +1,7 @@
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/abi_self_test.cc
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/abi_self_test.cc
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/crypto/abi_self_test.cc
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/abi_self_test.cc
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/crypto/abi_self_test.cc
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/abi_self_test.cc
 @@ -525,5 +525,291 @@ TEST(ABITest, AArch64) {
  }
  #endif  // OPENSSL_AARCH64 && SUPPORTS_ABI_TEST
@@ -294,10 +294,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/abi_self_test.cc
 +
  }  // namespace
  BSSL_NAMESPACE_END
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/cpu_ppc64le.cc
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/cpu_ppc64le.cc
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/cpu_ppc64le.cc
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/cpu_ppc64le.cc
 @@ -0,0 +1,40 @@
 +/* Copyright (c) 2016, Google Inc.
 + *
@@ -339,10 +339,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/cpu_ppc64le.cc
 +}
 +
 +#endif  // OPENSSL_PPC64LE
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/crypto.cc
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/crypto.cc
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/crypto/crypto.cc
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/crypto.cc
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/crypto/crypto.cc
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/crypto.cc
 @@ -69,6 +69,10 @@ uint32_t bssl::OPENSSL_get_ia32cap(int i
    return OPENSSL_ia32cap_P[idx];
  }
@@ -354,10 +354,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/crypto.cc
  #elif (defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)) && \
      !defined(OPENSSL_STATIC_ARMCAP)
  HIDDEN uint32_t bssl::OPENSSL_armcap_P = 0;
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
 @@ -0,0 +1,3809 @@
 +#! /usr/bin/env perl
 +# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved.
@@ -4168,10 +4168,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/as
 +}
 +
 +close STDOUT or die "error closing STDOUT: $!";
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
 @@ -81,6 +81,12 @@ inline int vpaes_capable() { return CRYP
  inline int vpaes_capable() { return CRYPTO_is_NEON_capable(); }
  #endif
@@ -4185,8 +4185,8 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/in
  #endif
  
  #endif  // !NO_ASM
-@@ -513,6 +519,13 @@ extern "C" void aes_gcm_dec_kernel_eor3(
-                                    const AES_KEY *key, const u128 Htable[16]);
+@@ -518,6 +524,13 @@ extern "C" void aes_gcm_dec_kernel_eor3(
+                                         const u128 Htable[16]);
  #endif
  
 +#elif defined(OPENSSL_PPC64LE)
@@ -4199,10 +4199,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/in
  #endif
  #endif  // OPENSSL_NO_ASM
  
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
 @@ -111,6 +111,7 @@ OPENSSL_CLANG_PRAGMA("clang diagnostic i
  #include "self_check/fips.cc.inc"
  #include "self_check/self_check.cc.inc"
@@ -4211,11 +4211,11 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
  #include "sha/sha1.cc.inc"
  #include "sha/sha256.cc.inc"
  #include "sha/sha512.cc.inc"
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
-@@ -1219,6 +1219,8 @@ int EVP_has_aes_hardware() {
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
+@@ -1234,6 +1234,8 @@ int EVP_has_aes_hardware() {
    return hwaes_capable() && crypto_gcm_clmul_enabled();
  #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
    return hwaes_capable() && CRYPTO_is_ARMv8_PMULL_capable();
@@ -4224,10 +4224,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/cipher
  #else
    return 0;
  #endif
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl
 @@ -0,0 +1,671 @@
 +#! /usr/bin/env perl
 +# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
@@ -4900,10 +4900,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/as
 +}
 +
 +close STDOUT or die "error closing STDOUT: $!"; # enforce flush
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
 @@ -243,6 +243,13 @@ void bssl::CRYPTO_ghash_init(gmult_func
      *out_hash = gcm_ghash_neon;
      return;
@@ -4918,11 +4918,11 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/gc
  #endif
  
    gcm_init_nohw(out_table, H);
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
-@@ -186,6 +186,16 @@ TEST(GCMTest, ABI) {
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
+@@ -185,6 +185,16 @@ TEST(GCMTest, ABI) {
      }
    }
  #endif
@@ -4939,14 +4939,14 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/aes/gc
  }
  #endif  // SUPPORTS_ABI_TEST && !OPENSSL_NO_ASM
  
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
-@@ -423,6 +423,11 @@ bcm_infallible bssl::BCM_rand_bytes_with
-     // Take a read lock around accesses to |state->drbg|. This is needed to
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
+@@ -433,6 +433,11 @@ bcm_infallible bssl::BCM_rand_bytes_with
+     // Take a read lock around accesses to `state->drbg`. This is needed to
      // avoid returning bad entropy if we race with
-     // |rand_thread_state_clear_all|.
+     // `rand_thread_state_clear_all`.
 +    //
 +    // This lock must be taken after any calls to |CRYPTO_sysrand| to avoid a
 +    // bug on ppc64le. glibc may implement pthread locks by wrapping user code
@@ -4955,10 +4955,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/rand/r
      state->clear_drbg_lock.LockRead();
  #endif
      if (!CTR_DRBG_reseed_ex(&state->drbg, seed, sizeof(seed),
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
 @@ -22,6 +22,16 @@
  
  BSSL_NAMESPACE_BEGIN
@@ -4976,10 +4976,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/sha/in
  // Define SHA{n}[_{variant}]_ASM if sha{n}_block_data_order[_{variant}] is
  // defined in assembly.
  
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
 @@ -0,0 +1,369 @@
 +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.ccom)
 + * All rights reserved.
@@ -5350,10 +5350,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/sha/sh
 +#undef BODY_20_39
 +#undef BODY_40_59
 +#undef BODY_60_79
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/internal.h
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/internal.h
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/crypto/internal.h
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/internal.h
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/crypto/internal.h
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/internal.h
 @@ -68,11 +68,12 @@
  BSSL_NAMESPACE_BEGIN
  
@@ -5370,7 +5370,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/internal.h
  #define NEED_CPUID
  
  // OPENSSL_cpuid_setup initializes the platform-specific feature cache. This
-@@ -1422,6 +1423,16 @@ inline int CRYPTO_is_ARMv8_SHA3_capable(
+@@ -1431,6 +1432,16 @@ inline int CRYPTO_is_ARMv8_SHA3_capable(
  #endif  // OPENSSL_ARM || OPENSSL_AARCH64
  
  
@@ -5387,10 +5387,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/internal.h
  #if defined(BORINGSSL_DISPATCH_TEST)
  // Runtime CPU dispatch testing support
  
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
 @@ -0,0 +1,320 @@
 +#! /usr/bin/env perl
 +# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
@@ -5712,10 +5712,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/perlasm/ppc-xlate
 +___
 +
 +close STDOUT or die "error closing STDOUT: $!";
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/test/abi_test.h
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/test/abi_test.h
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/crypto/test/abi_test.h
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/test/abi_test.h
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/crypto/test/abi_test.h
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/test/abi_test.h
 @@ -180,7 +180,78 @@ struct alignas(16) Reg128 {
    CALLER_STATE_REGISTER(uint64_t, x28)                               \
    CALLER_STATE_REGISTER(uint64_t, x29)
@@ -5807,7 +5807,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/test/abi_test.h
 +  // copy of a parameter is identical to the register one.
 +  return (crypto_word_t)t;
  #elif defined(OPENSSL_X86_64) || defined(OPENSSL_AARCH64)
-   // AAPCS64, section 5.4.2, clauses C.7 and C.14 says any remaining bits in
+   // AAPCS64, section 5.4.2, clauses C.7 and C.14 say any remaining bits in
    // aarch are unspecified. iOS64 contradicts this and says the callee extends
 @@ -286,9 +363,9 @@ inline crypto_word_t ToWord(T t) {
  template <typename R, typename... Args>
@@ -5822,10 +5822,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/test/abi_test.h
    static_assert(sizeof...(args) <= 8,
                  "too many arguments for abi_test_trampoline");
  
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
 @@ -0,0 +1,262 @@
 +#!/usr/bin/env perl
 +# Copyright (c) 2019, Google Inc.
@@ -6089,10 +6089,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/test/asm/trampoli
 +
 +print $code;
 +close STDOUT or die "error closing STDOUT: $!";
-Index: chromium-147.0.7727.49/third_party/boringssl/src/include/openssl/target.h
+Index: chromium-151.0.7922.47/third_party/boringssl/src/include/openssl/target.h
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/include/openssl/target.h
-+++ chromium-147.0.7727.49/third_party/boringssl/src/include/openssl/target.h
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/include/openssl/target.h
++++ chromium-151.0.7922.47/third_party/boringssl/src/include/openssl/target.h
 @@ -34,6 +34,9 @@
  #elif defined(__ARMEL__) || defined(_M_ARM)
  #define OPENSSL_32_BIT
@@ -6103,10 +6103,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/include/openssl/target.h
  #elif defined(__MIPSEL__) && !defined(__LP64__)
  #define OPENSSL_32_BIT
  #define OPENSSL_MIPS
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
 @@ -31,6 +31,8 @@ int main(int argc, char **argv) {
      puts("ARM (32-bit)");
  #elif defined(OPENSSL_AARCH64)
@@ -6116,10 +6116,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/acvp/modu
  #else
  #error "FIPS build not supported on this architecture"
  #endif
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/delocate.go
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/delocate.go
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/delocate.go
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/delocate.go
 @@ -56,7 +56,8 @@ type stringWriter interface {
  type processorType int
  
@@ -6149,7 +6149,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  	// gotExternalsNeeded is a set of symbol names for which we need
  	// “delta” symbols: symbols that contain the offset from their location
  	// to the memory in question.
-@@ -155,6 +161,8 @@ func (d *delocation) processInput(input
+@@ -157,6 +163,8 @@ func (d *delocation) processInput(input
  			switch d.processor {
  			case x86_64:
  				statement, err = d.processIntelInstruction(statement, node.up)
@@ -6158,7 +6158,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  			case aarch64:
  				statement, err = d.processAarch64Instruction(statement, node.up)
  			default:
-@@ -263,7 +271,7 @@ func (d *delocation) processDirective(st
+@@ -265,7 +273,7 @@ func (d *delocation) processDirective(st
  			d.writeNode(statement)
  			break
  
@@ -6167,7 +6167,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  			d.writeNode(statement)
  			break
  
-@@ -374,6 +382,10 @@ func (d *delocation) processLabelContain
+@@ -376,6 +384,10 @@ func (d *delocation) processLabelContain
  		d.output.WriteString("\t" + name + "\t" + strings.Join(args, ", ") + "\n")
  	}
  
@@ -6178,7 +6178,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  	return statement, nil
  }
  
-@@ -755,6 +767,191 @@ func (d *delocation) processAarch64Instr
+@@ -787,6 +799,191 @@ func (d *delocation) processAarch64Instr
  	return statement, nil
  }
  
@@ -6370,7 +6370,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  func (d *delocation) gatherOffsets(symRef *node32, offsets string) (*node32, string) {
  	for symRef != nil && symRef.pegRule == ruleOffset {
  		offset := d.contents(symRef)
-@@ -809,6 +1006,215 @@ func (d *delocation) parseMemRef(memRef
+@@ -841,6 +1038,215 @@ func (d *delocation) parseMemRef(memRef
  	return
  }
  
@@ -6586,7 +6586,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  /* Intel */
  
  type instructionType int
-@@ -1422,6 +1828,8 @@ func writeAarch64Function(w stringWriter
+@@ -1454,6 +1860,8 @@ func writeAarch64Function(w stringWriter
  func transform(w stringWriter, inputs []inputFile) error {
  	// symbols contains all defined symbols.
  	symbols := make(map[string]struct{})
@@ -6595,7 +6595,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  	// fileNumbers is the set of IDs seen in .file directives.
  	fileNumbers := make(map[int]struct{})
  	// maxObservedFileNumber contains the largest seen file number in a
-@@ -1454,6 +1862,25 @@ func transform(w stringWriter, inputs []
+@@ -1486,6 +1894,25 @@ func transform(w stringWriter, inputs []
  		}, ruleStatement, ruleSymbolDefiningDirective, ruleSymbolDefiningDirectiveName)
  
  		forEachPath(input.ast.up, func(node *node32) {
@@ -6621,7 +6621,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  			assertNodeType(node, ruleLocationDirective)
  			directive := input.contents[node.begin:node.end]
  			if !strings.HasPrefix(directive, ".file") {
-@@ -1507,11 +1934,13 @@ func transform(w stringWriter, inputs []
+@@ -1540,11 +1967,13 @@ func transform(w stringWriter, inputs []
  
  	d := &delocation{
  		symbols:             symbols,
@@ -6635,7 +6635,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  		gotExternalsNeeded:  make(map[string]struct{}),
  		gotOffsetsNeeded:    make(map[string]struct{}),
  		gotOffOffsetsNeeded: make(map[string]struct{}),
-@@ -1559,6 +1988,22 @@ func transform(w stringWriter, inputs []
+@@ -1592,6 +2021,22 @@ func transform(w stringWriter, inputs []
  	for _, name := range redirectorNames {
  		redirector := d.redirectors[name]
  		switch d.processor {
@@ -6658,7 +6658,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  		case aarch64:
  			writeAarch64Function(w, redirector, func(w stringWriter) {
  				w.WriteString("\tb " + name + "\n")
-@@ -1583,6 +2028,13 @@ func transform(w stringWriter, inputs []
+@@ -1616,6 +2061,13 @@ func transform(w stringWriter, inputs []
  		target := d.bssAccessorsNeeded[name]
  
  		switch d.processor {
@@ -6672,7 +6672,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  		case x86_64:
  			w.WriteString(".type " + funcName + ", @function\n")
  			w.WriteString(funcName + ":\n")
-@@ -1598,6 +2050,26 @@ func transform(w stringWriter, inputs []
+@@ -1631,6 +2083,26 @@ func transform(w stringWriter, inputs []
  	}
  
  	switch d.processor {
@@ -6699,7 +6699,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  	case aarch64:
  		externalNames := sortedSet(d.gotExternalsNeeded)
  		for _, symbol := range externalNames {
-@@ -1889,6 +2361,10 @@ func localTargetName(name string) string
+@@ -1923,6 +2395,10 @@ func localTargetName(name string) string
  	return ".L" + name + "_local_target"
  }
  
@@ -6710,7 +6710,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  func isSynthesized(symbol string) bool {
  	return strings.HasSuffix(symbol, "_bss_get")
  }
-@@ -1942,6 +2418,8 @@ func detectProcessor(input inputFile) pr
+@@ -1976,6 +2452,8 @@ func detectProcessor(input inputFile) pr
  		switch instructionName {
  		case "movq", "call", "leaq":
  			return x86_64
@@ -6719,10 +6719,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  		case "str", "bl", "ldr", "st1":
  			return aarch64
  		}
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
 @@ -12,9 +12,9 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
@@ -6736,10 +6736,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  
  # To regenerate delocate.peg.go:
  #
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
 @@ -40,6 +40,11 @@ func (test *delocateTest) Path(file stri
  var delocateTests = []delocateTest{
  	{"generic-AddrSig", []string{"in.s"}, "out.s"},
@@ -6752,10 +6752,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
  	{"x86_64-Basic", []string{"in.s"}, "out.s"},
  	{"x86_64-BSS", []string{"in.s"}, "out.s"},
  	{"x86_64-GOTRewrite", []string{"in.s"}, "out.s"},
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
 @@ -0,0 +1,9 @@
 +	.text
 +foo:
@@ -6766,10 +6766,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
 +	.localentry foo,.-foo
 +.LVL0:
 +	bl
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
 @@ -0,0 +1,62 @@
 +.text
 +.file 1 "inserted_by_delocate.cc"
@@ -6833,19 +6833,19 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
 +.byte 0xff
 +.byte 0x31
 +.byte 0x80
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
 @@ -0,0 +1,4 @@
 +	.text
 +foo:
 +	addis 22,2,bar@toc@ha
 +	ld 0,bar@toc@l(22)
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
 @@ -0,0 +1,72 @@
 +.text
 +.file 1 "inserted_by_delocate.cc"
@@ -6919,10 +6919,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
 +.byte 0xff
 +.byte 0x31
 +.byte 0x80
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
 @@ -0,0 +1,161 @@
 +	.file	"foo.cc"
 +	.abiversion 2
@@ -7085,10 +7085,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
 +	.size	exported_function,.-exported_function
 +	.ident	"GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2"
 +	.section	.note.GNU-stack,"",@progbits
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
 @@ -0,0 +1,552 @@
 +.text
 +.file 1 "inserted_by_delocate.cc"
@@ -7642,10 +7642,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
 +.byte 0xff
 +.byte 0x31
 +.byte 0x80
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
 @@ -0,0 +1,226 @@
 +	.file	"foo.cc"
 +	.abiversion 2
@@ -7873,10 +7873,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
 +	.zero	20
 +	.ident	"GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2"
 +	.section	.note.GNU-stack,"",@progbits
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
 @@ -0,0 +1,677 @@
 +.text
 +.file 1 "inserted_by_delocate.cc"
@@ -8555,10 +8555,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
 +.byte 0xff
 +.byte 0x31
 +.byte 0x80
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
 @@ -0,0 +1,23 @@
 +	.text
 +foo:
@@ -8583,10 +8583,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
 +
 +	addis 4, 2, 1+foo-2@toc@ha+3
 +	addi 4, 4, 1+foo-2@toc@l+3
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
 @@ -0,0 +1,178 @@
 +.text
 +.file 1 "inserted_by_delocate.cc"
@@ -8766,10 +8766,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/fipstools/delocate/
 +.byte 0xff
 +.byte 0x31
 +.byte 0x80
-Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
+Index: chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
-+++ chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
++++ chromium-151.0.7922.47/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
 @@ -381,6 +381,10 @@ static void sha1_block_data_order(uint32
      return;
    }
@@ -8781,10 +8781,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/crypto/fipsmodule/sha/sh
    sha1_block_data_order_nohw(state, data, num);
  }
  
-Index: chromium-147.0.7727.49/third_party/boringssl/src/build.json
+Index: chromium-151.0.7922.47/third_party/boringssl/src/build.json
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/build.json
-+++ chromium-147.0.7727.49/third_party/boringssl/src/build.json
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/build.json
++++ chromium-151.0.7922.47/third_party/boringssl/src/build.json
 @@ -129,6 +129,10 @@
              {"src": "crypto/fipsmodule/sha/asm/sha512-armv4.pl"},
              {"src": "crypto/fipsmodule/aes/asm/vpaes-armv7.pl"}
@@ -8804,7 +8804,7 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/build.json
              "crypto/crypto.cc",
              "crypto/curve25519/curve25519.cc",
              "crypto/curve25519/curve25519_64_adx.cc",
-@@ -805,6 +810,9 @@
+@@ -811,6 +816,9 @@
          "perlasm_arm": [
              {"src": "crypto/test/asm/trampoline-armv4.pl"}
          ],
@@ -8814,10 +8814,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/build.json
          "perlasm_x86": [
              {"src": "crypto/test/asm/trampoline-x86.pl"}
          ],
-Index: chromium-147.0.7727.49/third_party/boringssl/src/util/pregenerate/build.go
+Index: chromium-151.0.7922.47/third_party/boringssl/src/util/pregenerate/build.go
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/util/pregenerate/build.go
-+++ chromium-147.0.7727.49/third_party/boringssl/src/util/pregenerate/build.go
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/util/pregenerate/build.go
++++ chromium-151.0.7922.47/third_party/boringssl/src/util/pregenerate/build.go
 @@ -39,6 +39,7 @@ type InputTarget struct {
  	// architecture.
  	PerlasmAarch64 []PerlasmSource `json:"perlasm_aarch64,omitempty"`
@@ -8836,10 +8836,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/util/pregenerate/build.g
  	for _, p := range in.PerlasmX86 {
  		asmSrcs = append(asmSrcs,
  			addPerlasmTask(&out.Asm, &p, "-apple.S", []string{"macosx", "-fPIC"}),
-Index: chromium-147.0.7727.49/third_party/boringssl/README.ppc64le
+Index: chromium-151.0.7922.47/third_party/boringssl/README.ppc64le
 ===================================================================
 --- /dev/null
-+++ chromium-147.0.7727.49/third_party/boringssl/README.ppc64le
++++ chromium-151.0.7922.47/third_party/boringssl/README.ppc64le
 @@ -0,0 +1,8 @@
 +==============================================================
 +To recreate boringssl pregenerated files patch for ppc64le:
@@ -8849,10 +8849,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/README.ppc64le
 +go run ./util/pregenerate
 +cd ../../../../
 +diff -urN chromium-*/third_party/boringssl/src/gen.orig chromium-*/third_party/boringssl/src/gen
-Index: chromium-147.0.7727.49/third_party/boringssl/src/gen/sources.gni
+Index: chromium-151.0.7922.47/third_party/boringssl/src/gen/sources.gni
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/gen/sources.gni
-+++ chromium-147.0.7727.49/third_party/boringssl/src/gen/sources.gni
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/gen/sources.gni
++++ chromium-151.0.7922.47/third_party/boringssl/src/gen/sources.gni
 @@ -122,6 +122,7 @@ bcm_sources_asm = [
    "gen/bcm/aesv8-gcm-armv8-apple.S",
    "gen/bcm/aesv8-gcm-armv8-linux.S",
@@ -8877,10 +8877,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/gen/sources.gni
    "crypto/crypto.cc",
    "crypto/curve25519/curve25519.cc",
    "crypto/curve25519/curve25519_64_adx.cc",
-Index: chromium-147.0.7727.49/third_party/boringssl/src/gen/sources.bzl
+Index: chromium-151.0.7922.47/third_party/boringssl/src/gen/sources.bzl
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/boringssl/src/gen/sources.bzl
-+++ chromium-147.0.7727.49/third_party/boringssl/src/gen/sources.bzl
+--- chromium-151.0.7922.47.orig/third_party/boringssl/src/gen/sources.bzl
++++ chromium-151.0.7922.47/third_party/boringssl/src/gen/sources.bzl
 @@ -115,6 +115,7 @@ bcm_sources_asm = [
      "gen/bcm/aesni-x86-linux.S",
      "gen/bcm/aesni-x86_64-apple.S",
@@ -8905,10 +8905,10 @@ Index: chromium-147.0.7727.49/third_party/boringssl/src/gen/sources.bzl
      "crypto/crypto.cc",
      "crypto/curve25519/curve25519.cc",
      "crypto/curve25519/curve25519_64_adx.cc",
-Index: chromium-147.0.7727.49/third_party/perfetto/buildtools/grpc/BUILD.gn
+Index: chromium-151.0.7922.47/third_party/perfetto/buildtools/grpc/BUILD.gn
 ===================================================================
---- chromium-147.0.7727.49.orig/third_party/perfetto/buildtools/grpc/BUILD.gn
-+++ chromium-147.0.7727.49/third_party/perfetto/buildtools/grpc/BUILD.gn
+--- chromium-151.0.7922.47.orig/third_party/perfetto/buildtools/grpc/BUILD.gn
++++ chromium-151.0.7922.47/third_party/perfetto/buildtools/grpc/BUILD.gn
 @@ -99,6 +99,7 @@ static_library("boringssl") {
      "src/third_party/boringssl-with-bazel/src/crypto/cpu_arm_freebsd.cc",
      "src/third_party/boringssl-with-bazel/src/crypto/cpu_arm_linux.cc",

diff --git a/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch b/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch
index b92c526..f24025f 100644
--- a/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch
+++ b/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch
@@ -1,8 +1,8 @@
-Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/trap.cc
+Index: chromium-151.0.7922.47/sandbox/linux/seccomp-bpf/trap.cc
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf/trap.cc
-+++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/trap.cc
-@@ -231,6 +231,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+--- chromium-151.0.7922.47.orig/sandbox/linux/seccomp-bpf/trap.cc
++++ chromium-151.0.7922.47/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
        SetIsInSigHandler();
      }
  
@@ -23,10 +23,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/trap.cc
      // Copy the seccomp-specific data into a arch_seccomp_data structure. This
      // is what we are showing to TrapFnc callbacks that the system call
      // evaluator registered with the sandbox.
-Index: chromium-144.0.7559.59/sandbox/features.gni
+Index: chromium-151.0.7922.47/sandbox/features.gni
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/features.gni
-+++ chromium-144.0.7559.59/sandbox/features.gni
+--- chromium-151.0.7922.47.orig/sandbox/features.gni
++++ chromium-151.0.7922.47/sandbox/features.gni
 @@ -9,4 +9,5 @@
  use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
                    (current_cpu == "x86" || current_cpu == "x64" ||
@@ -34,10 +34,10 @@ Index: chromium-144.0.7559.59/sandbox/features.gni
 -                   current_cpu == "mipsel" || current_cpu == "mips64el")
 +                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
 +                   current_cpu == "ppc64")
-Index: chromium-144.0.7559.59/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+Index: chromium-151.0.7922.47/sandbox/policy/linux/bpf_renderer_policy_linux.cc
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-+++ chromium-144.0.7559.59/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+--- chromium-151.0.7922.47.orig/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ chromium-151.0.7922.47/sandbox/policy/linux/bpf_renderer_policy_linux.cc
 @@ -17,6 +17,11 @@
  #include "sandbox/linux/system_headers/linux_syscalls.h"
  #include "sandbox/policy/linux/sandbox_linux.h"
@@ -59,10 +59,10 @@ Index: chromium-144.0.7559.59/sandbox/policy/linux/bpf_renderer_policy_linux.cc
      case __NR_getrlimit:
      case __NR_setrlimit:
  // We allow setrlimit to dynamically adjust the address space limit as
-Index: chromium-144.0.7559.59/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+Index: chromium-151.0.7922.47/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-+++ chromium-144.0.7559.59/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+--- chromium-151.0.7922.47.orig/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ chromium-151.0.7922.47/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
 @@ -56,6 +56,13 @@
  #define MAX_PUBLIC_SYSCALL __NR_syscalls
  #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
@@ -77,10 +77,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
  #else
  #error "Unsupported architecture"
  #endif
-Index: chromium-144.0.7559.59/sandbox/linux/BUILD.gn
+Index: chromium-151.0.7922.47/sandbox/linux/BUILD.gn
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/BUILD.gn
-+++ chromium-144.0.7559.59/sandbox/linux/BUILD.gn
+--- chromium-151.0.7922.47.orig/sandbox/linux/BUILD.gn
++++ chromium-151.0.7922.47/sandbox/linux/BUILD.gn
 @@ -376,6 +376,8 @@ component("sandbox_services") {
  
  source_set("sandbox_services_headers") {
@@ -90,10 +90,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/BUILD.gn
      "system_headers/arm64_linux_syscalls.h",
      "system_headers/arm_linux_syscalls.h",
      "system_headers/arm_linux_ucontext.h",
-Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_syscalls.h
+Index: chromium-151.0.7922.47/sandbox/linux/system_headers/linux_syscalls.h
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/system_headers/linux_syscalls.h
-+++ chromium-144.0.7559.59/sandbox/linux/system_headers/linux_syscalls.h
+--- chromium-151.0.7922.47.orig/sandbox/linux/system_headers/linux_syscalls.h
++++ chromium-151.0.7922.47/sandbox/linux/system_headers/linux_syscalls.h
 @@ -44,4 +44,8 @@
  #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
  #endif
@@ -103,10 +103,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_syscalls.h
 +#endif
 +
  #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
-Index: chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+Index: chromium-151.0.7922.47/sandbox/linux/system_headers/ppc64_linux_syscalls.h
 ===================================================================
 --- /dev/null
-+++ chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_syscalls.h
++++ chromium-151.0.7922.47/sandbox/linux/system_headers/ppc64_linux_syscalls.h
 @@ -0,0 +1,28 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
@@ -136,10 +136,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_syscalls.
 +#endif
 +
 +#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-Index: chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+Index: chromium-151.0.7922.47/sandbox/linux/system_headers/ppc64_linux_ucontext.h
 ===================================================================
 --- /dev/null
-+++ chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_ucontext.h
++++ chromium-151.0.7922.47/sandbox/linux/system_headers/ppc64_linux_ucontext.h
 @@ -0,0 +1,12 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
@@ -153,10 +153,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_ucontext.
 +//TODO: is it necessary to redefine ucontext on PPC64?
 +
 +#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-Index: chromium-144.0.7559.59/sandbox/linux/syscall_broker/broker_process.cc
+Index: chromium-151.0.7922.47/sandbox/linux/syscall_broker/broker_process.cc
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/syscall_broker/broker_process.cc
-+++ chromium-144.0.7559.59/sandbox/linux/syscall_broker/broker_process.cc
+--- chromium-151.0.7922.47.orig/sandbox/linux/syscall_broker/broker_process.cc
++++ chromium-151.0.7922.47/sandbox/linux/syscall_broker/broker_process.cc
 @@ -166,7 +166,7 @@ bool BrokerProcess::IsSyscallBrokerable(
  #if defined(__NR_fstatat64)
      case __NR_fstatat64:
@@ -166,11 +166,11 @@ Index: chromium-144.0.7559.59/sandbox/linux/syscall_broker/broker_process.cc
      case __NR_newfstatat:
  #endif
        return !fast_check || policy_->allowed_command_set.test(COMMAND_STAT);
-Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+Index: chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-@@ -90,7 +90,8 @@ bool IsBaselinePolicyWatched(int sysno)
+--- chromium-151.0.7922.47.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -91,7 +91,8 @@ bool IsBaselinePolicyWatched(int sysno)
           SyscallSets::IsPrctl(sysno) ||
           SyscallSets::IsProcessGroupOrSession(sysno) ||
  #if defined(__i386__) || \
@@ -180,7 +180,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy.
           SyscallSets::IsSocketCall(sysno) ||
  #endif
  #if defined(__arm__)
-@@ -259,7 +260,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+@@ -260,7 +261,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
  
    // TODO(crbug.com/40528912): should i386 really be in this list?
  #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -189,7 +189,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy.
    if (sysno == __NR_mmap)
      return RestrictMmapFlags();
  #endif
-@@ -342,7 +343,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+@@ -358,7 +359,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
    }
  
  #if defined(__i386__) || \
@@ -199,10 +199,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy.
    if (SyscallSets::IsSocketCall(sysno))
      return RestrictSocketcallCommand();
  #endif
-Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+Index: chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+--- chromium-151.0.7922.47.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 @@ -43,7 +43,7 @@
  #define MAP_DROPPABLE 0x08  // Zero memory under memory pressure.
  #endif
@@ -282,7 +282,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_paramete
  ResultExpr RestrictSocketcallCommand() {
    // Unfortunately, we are unable to restrict the first parameter to
    // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
-@@ -489,7 +514,7 @@ ResultExpr RestrictPtrace() {
+@@ -483,7 +508,7 @@ ResultExpr RestrictPtrace() {
  #endif
    return Switch(request)
        .Cases({
@@ -291,7 +291,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_paramete
                   PTRACE_GETREGS, PTRACE_GETFPREGS, PTRACE_GET_THREAD_AREA,
                   PTRACE_GETREGSET,
  #endif
-@@ -529,13 +554,14 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+@@ -523,13 +548,14 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
    size_t argIndex;
    switch (sysno) {
  #if defined(__arm__) || \
@@ -308,11 +308,11 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_paramete
      case __NR_sendto:  // Could specify destination.
        argIndex = 3;
        break;
-Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+Index: chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-+++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-@@ -56,7 +56,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+--- chromium-151.0.7922.47.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -58,7 +58,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
  // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
  SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
  
@@ -321,10 +321,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_paramete
  // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
  // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
  SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
-Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+Index: chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+--- chromium-151.0.7922.47.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 @@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int s
    switch (sysno) {
      case __NR_gettimeofday:
@@ -532,7 +532,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR__llseek:
  #endif
  #if !defined(__aarch64__)
-@@ -604,18 +621,19 @@ bool SyscallSets::IsAllowedGeneralIo(int
+@@ -604,11 +621,12 @@ bool SyscallSets::IsAllowedGeneralIo(int
      case __NR_readv:
      case __NR_pread64:
  #if defined(__arm__) || \
@@ -547,6 +547,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_recvfrom:  // Could specify source.
      case __NR_recvmsg:   // Could specify source.
  #endif
+@@ -620,10 +638,10 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recvmmsg_time64:  // Could specify source.
+ #endif
 -#if defined(__i386__) || defined(__x86_64__)
 +#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
      case __NR_select:
@@ -556,8 +560,8 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR__newselect:
  #endif
      case __NR_write:
-@@ -635,11 +653,12 @@ bool SyscallSets::IsAllowedGeneralIo(int
- #endif
+@@ -638,11 +656,12 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_vmsplice:
  // send* syscalls need their flags filtered.
  #if defined(__arm__) || \
 -    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
@@ -571,7 +575,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_sendmsg:  // Could specify destination.
      case __NR_sendto:   // Could specify destination.
  #endif
-@@ -652,11 +671,12 @@ bool SyscallSets::IsAllowedGeneralIo(int
+@@ -655,11 +674,12 @@ bool SyscallSets::IsAllowedGeneralIo(int
  bool SyscallSets::IsSockSendOneMsg(int sysno) {
    switch (sysno) {
  #if defined(__arm__) || \
@@ -586,7 +590,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_sendmsg:  // Could specify destination.
      case __NR_sendto:   // Could specify destination.
  #endif
-@@ -697,7 +717,8 @@ bool SyscallSets::IsAllowedBasicSchedule
+@@ -700,7 +720,8 @@ bool SyscallSets::IsAllowedBasicSchedule
        return true;
      case __NR_getpriority:
  #if defined(__i386__) || defined(__arm__) || \
@@ -596,7 +600,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_nice:
  #endif
      case __NR_setpriority:
-@@ -709,7 +730,8 @@ bool SyscallSets::IsAllowedBasicSchedule
+@@ -712,7 +733,8 @@ bool SyscallSets::IsAllowedBasicSchedule
  bool SyscallSets::IsAdminOperation(int sysno) {
    switch (sysno) {
  #if defined(__i386__) || defined(__arm__) || \
@@ -606,7 +610,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_bdflush:
  #endif
      case __NR_kexec_load:
-@@ -725,7 +747,8 @@ bool SyscallSets::IsAdminOperation(int s
+@@ -728,7 +750,8 @@ bool SyscallSets::IsAdminOperation(int s
  
  bool SyscallSets::IsKernelModule(int sysno) {
    switch (sysno) {
@@ -616,7 +620,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_create_module:
      case __NR_get_kernel_syms:  // Should ENOSYS.
      case __NR_query_module:
-@@ -758,7 +781,8 @@ bool SyscallSets::IsFsControl(int sysno)
+@@ -761,7 +784,8 @@ bool SyscallSets::IsFsControl(int sysno)
      case __NR_swapoff:
      case __NR_swapon:
  #if defined(__i386__) || \
@@ -626,7 +630,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_umount:
  #endif
      case __NR_umount2:
-@@ -774,7 +798,7 @@ bool SyscallSets::IsNuma(int sysno) {
+@@ -777,7 +801,7 @@ bool SyscallSets::IsNuma(int sysno) {
      case __NR_getcpu:
      case __NR_mbind:
  #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -635,7 +639,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_migrate_pages:
  #endif
      case __NR_move_pages:
-@@ -809,14 +833,15 @@ bool SyscallSets::IsGlobalProcessEnviron
+@@ -812,14 +836,15 @@ bool SyscallSets::IsGlobalProcessEnviron
    switch (sysno) {
      case __NR_acct:  // Privileged.
  #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -654,7 +658,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_ulimit:
  #endif
      case __NR_getrusage:
-@@ -850,7 +875,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+@@ -853,7 +878,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
  #endif
      case __NR_sysinfo:
      case __NR_uname:
@@ -663,7 +667,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_olduname:
      case __NR_oldolduname:
  #endif
-@@ -914,12 +939,15 @@ bool SyscallSets::IsKeyManagement(int sy
+@@ -917,12 +942,15 @@ bool SyscallSets::IsKeyManagement(int sy
  }
  
  #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
@@ -680,7 +684,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_semtimedop:
  #if defined(__i386__) || defined(__arm__) || \
      (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-@@ -934,7 +962,8 @@ bool SyscallSets::IsSystemVSemaphores(in
+@@ -937,7 +965,8 @@ bool SyscallSets::IsSystemVSemaphores(in
  
  #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
      defined(__aarch64__) ||                                         \
@@ -690,7 +694,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
  // These give a lot of ambient authority and bypass the setuid sandbox.
  bool SyscallSets::IsSystemVSharedMemory(int sysno) {
    switch (sysno) {
-@@ -950,7 +979,8 @@ bool SyscallSets::IsSystemVSharedMemory(
+@@ -953,7 +982,8 @@ bool SyscallSets::IsSystemVSharedMemory(
  #endif
  
  #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
@@ -700,7 +704,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
  bool SyscallSets::IsSystemVMessageQueue(int sysno) {
    switch (sysno) {
      case __NR_msgctl:
-@@ -965,7 +995,8 @@ bool SyscallSets::IsSystemVMessageQueue(
+@@ -968,7 +998,8 @@ bool SyscallSets::IsSystemVMessageQueue(
  #endif
  
  #if defined(__i386__) || \
@@ -710,7 +714,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
  // Big system V multiplexing system call.
  bool SyscallSets::IsSystemVIpc(int sysno) {
    switch (sysno) {
-@@ -987,6 +1018,9 @@ bool SyscallSets::IsAnySystemV(int sysno
+@@ -990,6 +1021,9 @@ bool SyscallSets::IsAnySystemV(int sysno
  #elif defined(__i386__) || \
      (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
    return IsSystemVIpc(sysno);
@@ -720,7 +724,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
  #endif
  }
  
-@@ -1042,7 +1076,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+@@ -1045,7 +1079,8 @@ bool SyscallSets::IsFaNotify(int sysno)
  bool SyscallSets::IsTimer(int sysno) {
    switch (sysno) {
      case __NR_getitimer:
@@ -730,7 +734,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_alarm:
  #endif
      case __NR_setitimer:
-@@ -1121,18 +1156,22 @@ bool SyscallSets::IsMisc(int sysno) {
+@@ -1124,18 +1159,22 @@ bool SyscallSets::IsMisc(int sysno) {
      case __NR_syncfs:
      case __NR_vhangup:
  // The system calls below are not implemented.
@@ -757,7 +761,7 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_gtty:
      case __NR_idle:
      case __NR_lock:
-@@ -1140,20 +1179,22 @@ bool SyscallSets::IsMisc(int sysno) {
+@@ -1143,20 +1182,22 @@ bool SyscallSets::IsMisc(int sysno) {
      case __NR_prof:
      case __NR_profil:
  #endif
@@ -784,10 +788,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_vserver:
  #endif
        return true;
-Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+Index: chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-+++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+--- chromium-151.0.7922.47.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
 @@ -46,13 +46,14 @@ class SANDBOX_EXPORT SyscallSets {
    static bool IsDeniedGetOrModifySocket(int sysno);
  
@@ -837,10 +841,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
    // Big system V multiplexing system call.
    static bool IsSystemVIpc(int sysno);
  #endif
-Index: chromium-144.0.7559.59/sandbox/linux/services/syscall_wrappers.cc
+Index: chromium-151.0.7922.47/sandbox/linux/services/syscall_wrappers.cc
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/services/syscall_wrappers.cc
-+++ chromium-144.0.7559.59/sandbox/linux/services/syscall_wrappers.cc
+--- chromium-151.0.7922.47.orig/sandbox/linux/services/syscall_wrappers.cc
++++ chromium-151.0.7922.47/sandbox/linux/services/syscall_wrappers.cc
 @@ -63,7 +63,7 @@ long sys_clone(unsigned long flags,
  #if defined(ARCH_CPU_X86_64)
    return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
@@ -850,10 +854,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/services/syscall_wrappers.cc
    // CONFIG_CLONE_BACKWARDS defined.
    return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
  #endif
-Index: chromium-144.0.7559.59/sandbox/linux/bpf_dsl/seccomp_macros.h
+Index: chromium-151.0.7922.47/sandbox/linux/bpf_dsl/seccomp_macros.h
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/bpf_dsl/seccomp_macros.h
-+++ chromium-144.0.7559.59/sandbox/linux/bpf_dsl/seccomp_macros.h
+--- chromium-151.0.7922.47.orig/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ chromium-151.0.7922.47/sandbox/linux/bpf_dsl/seccomp_macros.h
 @@ -14,6 +14,9 @@
  #if defined(__mips__)
  // sys/user.h in eglibc misses size_t definition
@@ -916,10 +920,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/bpf_dsl/seccomp_macros.h
  #else
  #error Unsupported target platform
  
-Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_seccomp.h
+Index: chromium-151.0.7922.47/sandbox/linux/system_headers/linux_seccomp.h
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/system_headers/linux_seccomp.h
-+++ chromium-144.0.7559.59/sandbox/linux/system_headers/linux_seccomp.h
+--- chromium-151.0.7922.47.orig/sandbox/linux/system_headers/linux_seccomp.h
++++ chromium-151.0.7922.47/sandbox/linux/system_headers/linux_seccomp.h
 @@ -38,6 +38,9 @@
  #ifndef EM_AARCH64
  #define EM_AARCH64 183
@@ -943,10 +947,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_seccomp.h
  
  // For prctl.h
  #ifndef PR_SET_SECCOMP
-Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_signal.h
+Index: chromium-151.0.7922.47/sandbox/linux/system_headers/linux_signal.h
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/system_headers/linux_signal.h
-+++ chromium-144.0.7559.59/sandbox/linux/system_headers/linux_signal.h
+--- chromium-151.0.7922.47.orig/sandbox/linux/system_headers/linux_signal.h
++++ chromium-151.0.7922.47/sandbox/linux/system_headers/linux_signal.h
 @@ -13,7 +13,7 @@
  // (not undefined, but defined different values and in different memory
  // layouts). So, fill the gap here.
@@ -956,10 +960,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_signal.h
  
  #define LINUX_SIGHUP 1
  #define LINUX_SIGINT 2
-Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/syscall.cc
+Index: chromium-151.0.7922.47/sandbox/linux/seccomp-bpf/syscall.cc
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf/syscall.cc
-+++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/syscall.cc
+--- chromium-151.0.7922.47.orig/sandbox/linux/seccomp-bpf/syscall.cc
++++ chromium-151.0.7922.47/sandbox/linux/seccomp-bpf/syscall.cc
 @@ -19,7 +19,7 @@ namespace sandbox {
  namespace {
  
@@ -1054,10 +1058,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/syscall.cc
  #endif
    SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
  }
-Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+Index: chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-+++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+--- chromium-151.0.7922.47.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
 @@ -354,8 +354,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create)
  
  #if !defined(__aarch64__)
@@ -1069,10 +1073,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy_
  
  #if defined(LIBC_GLIBC) && !BUILDFLAG(IS_CHROMEOS)
  BPF_TEST_C(BaselinePolicy, FutexEINVAL, BaselinePolicy) {
-Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_stat.h
+Index: chromium-151.0.7922.47/sandbox/linux/system_headers/linux_stat.h
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/system_headers/linux_stat.h
-+++ chromium-144.0.7559.59/sandbox/linux/system_headers/linux_stat.h
+--- chromium-151.0.7922.47.orig/sandbox/linux/system_headers/linux_stat.h
++++ chromium-151.0.7922.47/sandbox/linux/system_headers/linux_stat.h
 @@ -173,6 +173,28 @@ struct kernel_stat {
    unsigned int __unused4;
    unsigned int __unused5;
@@ -1102,10 +1106,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_stat.h
  #endif
  
  #if !defined(AT_EMPTY_PATH)
-Index: chromium-144.0.7559.59/sandbox/linux/services/credentials.cc
+Index: chromium-151.0.7922.47/sandbox/linux/services/credentials.cc
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/services/credentials.cc
-+++ chromium-144.0.7559.59/sandbox/linux/services/credentials.cc
+--- chromium-151.0.7922.47.orig/sandbox/linux/services/credentials.cc
++++ chromium-151.0.7922.47/sandbox/linux/services/credentials.cc
 @@ -85,7 +85,7 @@ bool ChrootToSafeEmptyDir() {
    alignas(16) std::array<char, PTHREAD_STACK_MIN_CONST> stack_buf;
  
@@ -1137,10 +1141,10 @@ Index: chromium-144.0.7559.59/sandbox/linux/services/credentials.cc
    clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
  
    char tls_buf[PTHREAD_STACK_MIN_CONST] = {};
-Index: chromium-144.0.7559.59/sandbox/policy/linux/bpf_utility_policy_linux.cc
+Index: chromium-151.0.7922.47/sandbox/policy/linux/bpf_utility_policy_linux.cc
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/policy/linux/bpf_utility_policy_linux.cc
-+++ chromium-144.0.7559.59/sandbox/policy/linux/bpf_utility_policy_linux.cc
+--- chromium-151.0.7922.47.orig/sandbox/policy/linux/bpf_utility_policy_linux.cc
++++ chromium-151.0.7922.47/sandbox/policy/linux/bpf_utility_policy_linux.cc
 @@ -34,7 +34,7 @@ ResultExpr UtilityProcessPolicy::Evaluat
      case __NR_fdatasync:
      case __NR_fsync:
@@ -1150,10 +1154,10 @@ Index: chromium-144.0.7559.59/sandbox/policy/linux/bpf_utility_policy_linux.cc
      case __NR_getrlimit:
  #endif
  #if defined(__i386__) || defined(__arm__)
-Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
+Index: chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
 ===================================================================
---- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
-+++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
+--- chromium-151.0.7922.47.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
++++ chromium-151.0.7922.47/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
 @@ -384,7 +384,16 @@ intptr_t SIGSYSFstatatHandler(const stru
    if (args.nr == __NR_fstatat_default) {
      if (*reinterpret_cast<const char*>(args.args[1]) == '\0' &&

diff --git a/0002-regenerate-xnn-buildgn.patch b/0002-regenerate-xnn-buildgn.patch
index 18823db..37630af 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-150.0.7871.46/third_party/xnnpack/BUILD.gn
+Index: chromium-151.0.7922.47/third_party/xnnpack/BUILD.gn
 ===================================================================
---- chromium-150.0.7871.46.orig/third_party/xnnpack/BUILD.gn
-+++ chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
+--- chromium-151.0.7922.47.orig/third_party/xnnpack/BUILD.gn
++++ chromium-151.0.7922.47/third_party/xnnpack/BUILD.gn
 @@ -34,10 +34,10 @@ config("xnnpack_public_config") {
    }
  
@@ -26,7 +26,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  }
  
  config("xnnpack_private_config") {
-@@ -48,2068 +48,2352 @@ config("xnnpack_private_config") {
+@@ -48,2102 +48,2390 @@ config("xnnpack_private_config") {
    ]
  }
  
@@ -38,6 +38,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":bf16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 +    ":bf16-f32-vcvt_x64",
 +    ":bf16-qs8-vcvt_x64",
++    ":bf16-qu8-vcvt_x64",
 +    ":bf16-rminmax_x64",
 +    ":configs_x64",
 +    ":enums_x64",
@@ -50,7 +51,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-f32-vcvt_sse4.1-no-sse4.2",
 +    ":f16-f32-vcvt_x64",
 +    ":f16-f32acc-gemm_f16c-fma-avx2",
++    ":f16-f32acc-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 +    ":f16-f32acc-igemm_f16c-fma-avx2",
++    ":f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 +    ":f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 +    ":f16-f32acc-rdsum2_f16c-no-avx2-no-fma",
 +    ":f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
@@ -59,7 +62,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-f32acc-rsum2_f16c-no-avx2-no-fma",
 +    ":f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 +    ":f16-f32acc-rsum_f16c-no-avx2-no-fma",
++    ":f16-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 +    ":f16-ibilinear_f16c-fma-no-avx2",
++    ":f16-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 +    ":f16-maxpool_f16c-fma-avx2",
 +    ":f16-maxpool_sse4.1-no-sse4.2",
 +    ":f16-qs8-vcvt_x64",
@@ -70,6 +75,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 +    ":f16-rminmax_f16c-no-avx2-no-fma",
 +    ":f16-rminmax_x64",
++    ":f16-vapproxgelu_avx512f",
++    ":f16-vapproxgelu_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
++    ":f16-vapproxgelu_f16c-no-avx2-no-fma",
 +    ":f16-vapproxgelu_x64",
 +    ":f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 +    ":f16-vbinary_f16c-no-avx2-no-fma",
@@ -79,7 +87,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-vexp_x64",
 +    ":f16-vgelu_x64",
 +    ":f16-vhswish_f16c-no-avx2-no-fma",
++    ":f16-vlog_avx512f",
 +    ":f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
++    ":f16-vlog_f16c-no-avx2-no-fma",
 +    ":f16-vlog_x64",
 +    ":f16-vlrelu_f16c-no-avx2-no-fma",
 +    ":f16-vmulcaddc_f16c-fma-no-avx2",
@@ -89,8 +99,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-vsin_x64",
 +    ":f16-vsqrt_f16c-no-avx2-no-fma",
 +    ":f16-vsqrt_x64",
++    ":f16-vtanh_avx512f",
 +    ":f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
-+    ":f16-vtanh_f16c-fma-no-avx2",
 +    ":f16-vtanh_f16c-no-avx2-no-fma",
 +    ":f16-vtanh_x64",
 +    ":f16-vunary_f16c-no-avx2-no-fma",
@@ -363,6 +373,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni",
 +    ":qs8-qc4w-gemm_ssse3-no-sse4.1",
 +    ":qs8-qc4w-gemm_x64",
++    ":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-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",
@@ -539,6 +552,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":u8-vclamp_sse2-no-sse3",
 +    ":u8-vclamp_x64",
 +    ":x16-packw_f16c-fma-avx2",
++    ":x16-packw_x64",
 +    ":x16-transposec_f16c-fma-avx2",
 +    ":x16-transposec_sse2-no-sse3",
 +    ":x16-transposec_x64",
@@ -581,6 +595,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":bf16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 +    ":bf16-f32-vcvt_x64_standalone",
 +    ":bf16-qs8-vcvt_x64_standalone",
++    ":bf16-qu8-vcvt_x64_standalone",
 +    ":bf16-rminmax_x64_standalone",
 +    ":configs_x64_standalone",
 +    ":enums_x64_standalone",
@@ -593,7 +608,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-f32-vcvt_sse4.1-no-sse4.2_standalone",
 +    ":f16-f32-vcvt_x64_standalone",
 +    ":f16-f32acc-gemm_f16c-fma-avx2_standalone",
++    ":f16-f32acc-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 +    ":f16-f32acc-igemm_f16c-fma-avx2_standalone",
++    ":f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 +    ":f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 +    ":f16-f32acc-rdsum2_f16c-no-avx2-no-fma_standalone",
 +    ":f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
@@ -602,7 +619,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-f32acc-rsum2_f16c-no-avx2-no-fma_standalone",
 +    ":f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 +    ":f16-f32acc-rsum_f16c-no-avx2-no-fma_standalone",
++    ":f16-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
 +    ":f16-ibilinear_f16c-fma-no-avx2_standalone",
++    ":f16-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
 +    ":f16-maxpool_f16c-fma-avx2_standalone",
 +    ":f16-maxpool_sse4.1-no-sse4.2_standalone",
 +    ":f16-qs8-vcvt_x64_standalone",
@@ -613,6 +632,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
 +    ":f16-rminmax_f16c-no-avx2-no-fma_standalone",
 +    ":f16-rminmax_x64_standalone",
++    ":f16-vapproxgelu_avx512f_standalone",
++    ":f16-vapproxgelu_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
++    ":f16-vapproxgelu_f16c-no-avx2-no-fma_standalone",
 +    ":f16-vapproxgelu_x64_standalone",
 +    ":f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
 +    ":f16-vbinary_f16c-no-avx2-no-fma_standalone",
@@ -622,7 +644,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-vexp_x64_standalone",
 +    ":f16-vgelu_x64_standalone",
 +    ":f16-vhswish_f16c-no-avx2-no-fma_standalone",
++    ":f16-vlog_avx512f_standalone",
 +    ":f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
++    ":f16-vlog_f16c-no-avx2-no-fma_standalone",
 +    ":f16-vlog_x64_standalone",
 +    ":f16-vlrelu_f16c-no-avx2-no-fma_standalone",
 +    ":f16-vmulcaddc_f16c-fma-no-avx2_standalone",
@@ -632,8 +656,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-vsin_x64_standalone",
 +    ":f16-vsqrt_f16c-no-avx2-no-fma_standalone",
 +    ":f16-vsqrt_x64_standalone",
++    ":f16-vtanh_avx512f_standalone",
 +    ":f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
-+    ":f16-vtanh_f16c-fma-no-avx2_standalone",
 +    ":f16-vtanh_f16c-no-avx2-no-fma_standalone",
 +    ":f16-vtanh_x64_standalone",
 +    ":f16-vunary_f16c-no-avx2-no-fma_standalone",
@@ -906,6 +930,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone",
 +    ":qs8-qc4w-gemm_ssse3-no-sse4.1_standalone",
 +    ":qs8-qc4w-gemm_x64_standalone",
++    ":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-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",
@@ -1082,6 +1109,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":u8-vclamp_sse2-no-sse3_standalone",
 +    ":u8-vclamp_x64_standalone",
 +    ":x16-packw_f16c-fma-avx2_standalone",
++    ":x16-packw_x64_standalone",
 +    ":x16-transposec_f16c-fma-avx2_standalone",
 +    ":x16-transposec_sse2-no-sse3_standalone",
 +    ":x16-transposec_x64_standalone",
@@ -1126,6 +1154,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":bf16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 -      ":bf16-f32-vcvt_x64",
 -      ":bf16-qs8-vcvt_x64",
+-      ":bf16-qu8-vcvt_x64",
 -      ":bf16-rminmax_x64",
 -      ":configs_x64",
 -      ":enums_x64",
@@ -1138,7 +1167,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-f32-vcvt_sse4.1-no-sse4.2",
 -      ":f16-f32-vcvt_x64",
 -      ":f16-f32acc-gemm_f16c-fma-avx2",
+-      ":f16-f32acc-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 -      ":f16-f32acc-igemm_f16c-fma-avx2",
+-      ":f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 -      ":f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 -      ":f16-f32acc-rdsum2_f16c-no-avx2-no-fma",
 -      ":f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
@@ -1147,7 +1178,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-f32acc-rsum2_f16c-no-avx2-no-fma",
 -      ":f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 -      ":f16-f32acc-rsum_f16c-no-avx2-no-fma",
+-      ":f16-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 -      ":f16-ibilinear_f16c-fma-no-avx2",
+-      ":f16-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 -      ":f16-maxpool_f16c-fma-avx2",
 -      ":f16-maxpool_sse4.1-no-sse4.2",
 -      ":f16-qs8-vcvt_x64",
@@ -1158,6 +1191,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 -      ":f16-rminmax_f16c-no-avx2-no-fma",
 -      ":f16-rminmax_x64",
+-      ":f16-vapproxgelu_avx512f",
+-      ":f16-vapproxgelu_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
+-      ":f16-vapproxgelu_f16c-no-avx2-no-fma",
 -      ":f16-vapproxgelu_x64",
 -      ":f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 -      ":f16-vbinary_f16c-no-avx2-no-fma",
@@ -1167,7 +1203,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-vexp_x64",
 -      ":f16-vgelu_x64",
 -      ":f16-vhswish_f16c-no-avx2-no-fma",
+-      ":f16-vlog_avx512f",
 -      ":f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
+-      ":f16-vlog_f16c-no-avx2-no-fma",
 -      ":f16-vlog_x64",
 -      ":f16-vlrelu_f16c-no-avx2-no-fma",
 -      ":f16-vmulcaddc_f16c-fma-no-avx2",
@@ -1177,8 +1215,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-vsin_x64",
 -      ":f16-vsqrt_f16c-no-avx2-no-fma",
 -      ":f16-vsqrt_x64",
+-      ":f16-vtanh_avx512f",
 -      ":f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
--      ":f16-vtanh_f16c-fma-no-avx2",
 -      ":f16-vtanh_f16c-no-avx2-no-fma",
 -      ":f16-vtanh_x64",
 -      ":f16-vunary_f16c-no-avx2-no-fma",
@@ -1451,6 +1489,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni",
 -      ":qs8-qc4w-gemm_ssse3-no-sse4.1",
 -      ":qs8-qc4w-gemm_x64",
+-      ":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-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",
@@ -1627,6 +1668,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":u8-vclamp_sse2-no-sse3",
 -      ":u8-vclamp_x64",
 -      ":x16-packw_f16c-fma-avx2",
+-      ":x16-packw_x64",
 -      ":x16-transposec_f16c-fma-avx2",
 -      ":x16-transposec_sse2-no-sse3",
 -      ":x16-transposec_x64",
@@ -1663,6 +1705,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":xx-transposev_x64",
 +    ":bf16-f32-vcvt_arm64",
 +    ":bf16-qs8-vcvt_arm64",
++    ":bf16-qu8-vcvt_arm64",
 +    ":bf16-rminmax_arm64",
 +    ":configs_arm64",
 +    ":enums_arm64",
@@ -1903,6 +1946,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":bf16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 -      ":bf16-f32-vcvt_x64_standalone",
 -      ":bf16-qs8-vcvt_x64_standalone",
+-      ":bf16-qu8-vcvt_x64_standalone",
 -      ":bf16-rminmax_x64_standalone",
 -      ":configs_x64_standalone",
 -      ":enums_x64_standalone",
@@ -1915,7 +1959,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-f32-vcvt_sse4.1-no-sse4.2_standalone",
 -      ":f16-f32-vcvt_x64_standalone",
 -      ":f16-f32acc-gemm_f16c-fma-avx2_standalone",
+-      ":f16-f32acc-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 -      ":f16-f32acc-igemm_f16c-fma-avx2_standalone",
+-      ":f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 -      ":f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 -      ":f16-f32acc-rdsum2_f16c-no-avx2-no-fma_standalone",
 -      ":f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
@@ -1924,7 +1970,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-f32acc-rsum2_f16c-no-avx2-no-fma_standalone",
 -      ":f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 -      ":f16-f32acc-rsum_f16c-no-avx2-no-fma_standalone",
+-      ":f16-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
 -      ":f16-ibilinear_f16c-fma-no-avx2_standalone",
+-      ":f16-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
 -      ":f16-maxpool_f16c-fma-avx2_standalone",
 -      ":f16-maxpool_sse4.1-no-sse4.2_standalone",
 -      ":f16-qs8-vcvt_x64_standalone",
@@ -1935,6 +1983,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 -      ":f16-rminmax_f16c-no-avx2-no-fma_standalone",
 -      ":f16-rminmax_x64_standalone",
+-      ":f16-vapproxgelu_avx512f_standalone",
+-      ":f16-vapproxgelu_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
+-      ":f16-vapproxgelu_f16c-no-avx2-no-fma_standalone",
 -      ":f16-vapproxgelu_x64_standalone",
 -      ":f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
 -      ":f16-vbinary_f16c-no-avx2-no-fma_standalone",
@@ -1944,7 +1995,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-vexp_x64_standalone",
 -      ":f16-vgelu_x64_standalone",
 -      ":f16-vhswish_f16c-no-avx2-no-fma_standalone",
+-      ":f16-vlog_avx512f_standalone",
 -      ":f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
+-      ":f16-vlog_f16c-no-avx2-no-fma_standalone",
 -      ":f16-vlog_x64_standalone",
 -      ":f16-vlrelu_f16c-no-avx2-no-fma_standalone",
 -      ":f16-vmulcaddc_f16c-fma-no-avx2_standalone",
@@ -1954,8 +2007,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-vsin_x64_standalone",
 -      ":f16-vsqrt_f16c-no-avx2-no-fma_standalone",
 -      ":f16-vsqrt_x64_standalone",
+-      ":f16-vtanh_avx512f_standalone",
 -      ":f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
--      ":f16-vtanh_f16c-fma-no-avx2_standalone",
 -      ":f16-vtanh_f16c-no-avx2-no-fma_standalone",
 -      ":f16-vtanh_x64_standalone",
 -      ":f16-vunary_f16c-no-avx2-no-fma_standalone",
@@ -2228,6 +2281,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 -      ":qs8-qc4w-gemm_ssse3-no-sse4.1_standalone",
 -      ":qs8-qc4w-gemm_x64_standalone",
+-      ":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-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",
@@ -2404,6 +2460,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":u8-vclamp_sse2-no-sse3_standalone",
 -      ":u8-vclamp_x64_standalone",
 -      ":x16-packw_f16c-fma-avx2_standalone",
+-      ":x16-packw_x64_standalone",
 -      ":x16-transposec_f16c-fma-avx2_standalone",
 -      ":x16-transposec_sse2-no-sse3_standalone",
 -      ":x16-transposec_x64_standalone",
@@ -2440,6 +2497,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":xx-transposev_x64_standalone",
 +    ":bf16-f32-vcvt_arm64_standalone",
 +    ":bf16-qs8-vcvt_arm64_standalone",
++    ":bf16-qu8-vcvt_arm64_standalone",
 +    ":bf16-rminmax_arm64_standalone",
 +    ":configs_arm64_standalone",
 +    ":enums_arm64_standalone",
@@ -2682,6 +2740,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
      xnnpack_deps = [
 -      ":bf16-f32-vcvt_arm64",
 -      ":bf16-qs8-vcvt_arm64",
+-      ":bf16-qu8-vcvt_arm64",
 -      ":bf16-rminmax_arm64",
 -      ":configs_arm64",
 -      ":enums_arm64",
@@ -2916,6 +2975,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":xx-transposev_arm64",
 +    ":bf16-f32-vcvt_riscv64",
 +    ":bf16-qs8-vcvt_riscv64",
++    ":bf16-qu8-vcvt_riscv64",
 +    ":bf16-rminmax_riscv64",
 +    ":configs_riscv64",
 +    ":enums_riscv64",
@@ -2938,7 +2998,6 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-rminmax_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-rminmax_riscv64",
 +    ":f16-spmm_arch=rv64gc_zvfh-abi=lp64d",
-+    ":f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-vapproxgelu_riscv64",
 +    ":f16-vbinary_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-vclamp_arch=rv64gc_zvfh-abi=lp64d",
@@ -2951,6 +3010,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-vgelu_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-vgelu_riscv64",
 +    ":f16-vhswish_arch=rv64gc_zvfh-abi=lp64d",
++    ":f16-vlog_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-vlog_riscv64",
 +    ":f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d",
@@ -3142,6 +3202,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":u8-rminmax_riscv64",
 +    ":u8-vclamp_arch=rv64gcv-abi=lp64d",
 +    ":u8-vclamp_riscv64",
++    ":x16-packw_riscv64",
 +    ":x16-transposec_riscv64",
 +    ":x16-x32-packw_riscv64",
 +    ":x24-transposec_riscv64",
@@ -3166,6 +3227,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
      xnnpack_standalone_deps = [
 -      ":bf16-f32-vcvt_arm64_standalone",
 -      ":bf16-qs8-vcvt_arm64_standalone",
+-      ":bf16-qu8-vcvt_arm64_standalone",
 -      ":bf16-rminmax_arm64_standalone",
 -      ":configs_arm64_standalone",
 -      ":enums_arm64_standalone",
@@ -3400,6 +3462,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":xx-transposev_arm64_standalone",
 +    ":bf16-f32-vcvt_riscv64_standalone",
 +    ":bf16-qs8-vcvt_riscv64_standalone",
++    ":bf16-qu8-vcvt_riscv64_standalone",
 +    ":bf16-rminmax_riscv64_standalone",
 +    ":configs_riscv64_standalone",
 +    ":enums_riscv64_standalone",
@@ -3422,7 +3485,6 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-rminmax_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f16-rminmax_riscv64_standalone",
 +    ":f16-spmm_arch=rv64gc_zvfh-abi=lp64d_standalone",
-+    ":f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f16-vapproxgelu_riscv64_standalone",
 +    ":f16-vbinary_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f16-vclamp_arch=rv64gc_zvfh-abi=lp64d_standalone",
@@ -3435,6 +3497,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":f16-vgelu_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f16-vgelu_riscv64_standalone",
 +    ":f16-vhswish_arch=rv64gc_zvfh-abi=lp64d_standalone",
++    ":f16-vlog_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f16-vlog_riscv64_standalone",
 +    ":f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d_standalone",
@@ -3626,6 +3689,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":u8-rminmax_riscv64_standalone",
 +    ":u8-vclamp_arch=rv64gcv-abi=lp64d_standalone",
 +    ":u8-vclamp_riscv64_standalone",
++    ":x16-packw_riscv64_standalone",
 +    ":x16-transposec_riscv64_standalone",
 +    ":x16-x32-packw_riscv64_standalone",
 +    ":x24-transposec_riscv64_standalone",
@@ -3653,6 +3717,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
      xnnpack_deps = [
 -      ":bf16-f32-vcvt_riscv64",
 -      ":bf16-qs8-vcvt_riscv64",
+-      ":bf16-qu8-vcvt_riscv64",
 -      ":bf16-rminmax_riscv64",
 -      ":configs_riscv64",
 -      ":enums_riscv64",
@@ -3675,7 +3740,6 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-rminmax_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-rminmax_riscv64",
 -      ":f16-spmm_arch=rv64gc_zvfh-abi=lp64d",
--      ":f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-vapproxgelu_riscv64",
 -      ":f16-vbinary_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-vclamp_arch=rv64gc_zvfh-abi=lp64d",
@@ -3688,6 +3752,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-vgelu_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-vgelu_riscv64",
 -      ":f16-vhswish_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-vlog_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-vlog_riscv64",
 -      ":f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d",
@@ -3879,6 +3944,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":u8-rminmax_riscv64",
 -      ":u8-vclamp_arch=rv64gcv-abi=lp64d",
 -      ":u8-vclamp_riscv64",
+-      ":x16-packw_riscv64",
 -      ":x16-transposec_riscv64",
 -      ":x16-x32-packw_riscv64",
 -      ":x24-transposec_riscv64",
@@ -3898,6 +3964,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":xx-transposev_riscv64",
 +    ":bf16-f32-vcvt_ppc64",
 +    ":bf16-qs8-vcvt_ppc64",
++    ":bf16-qu8-vcvt_ppc64",
 +    ":bf16-rminmax_ppc64",
 +    ":configs_ppc64",
 +    ":enums_ppc64",
@@ -4014,6 +4081,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":u8-rdminmax_ppc64",
 +    ":u8-rminmax_ppc64",
 +    ":u8-vclamp_ppc64",
++    ":x16-packw_ppc64",
 +    ":x16-transposec_ppc64",
 +    ":x16-x32-packw_ppc64",
 +    ":x24-transposec_ppc64",
@@ -4036,6 +4104,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
      xnnpack_standalone_deps = [
 -      ":bf16-f32-vcvt_riscv64_standalone",
 -      ":bf16-qs8-vcvt_riscv64_standalone",
+-      ":bf16-qu8-vcvt_riscv64_standalone",
 -      ":bf16-rminmax_riscv64_standalone",
 -      ":configs_riscv64_standalone",
 -      ":enums_riscv64_standalone",
@@ -4058,7 +4127,6 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-rminmax_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-rminmax_riscv64_standalone",
 -      ":f16-spmm_arch=rv64gc_zvfh-abi=lp64d_standalone",
--      ":f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-vapproxgelu_riscv64_standalone",
 -      ":f16-vbinary_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-vclamp_arch=rv64gc_zvfh-abi=lp64d_standalone",
@@ -4071,6 +4139,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":f16-vgelu_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-vgelu_riscv64_standalone",
 -      ":f16-vhswish_arch=rv64gc_zvfh-abi=lp64d_standalone",
+-      ":f16-vlog_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-vlog_riscv64_standalone",
 -      ":f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d_standalone",
@@ -4262,6 +4331,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":u8-rminmax_riscv64_standalone",
 -      ":u8-vclamp_arch=rv64gcv-abi=lp64d_standalone",
 -      ":u8-vclamp_riscv64_standalone",
+-      ":x16-packw_riscv64_standalone",
 -      ":x16-transposec_riscv64_standalone",
 -      ":x16-x32-packw_riscv64_standalone",
 -      ":x24-transposec_riscv64_standalone",
@@ -4281,6 +4351,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ":xx-transposev_riscv64_standalone",
 +    ":bf16-f32-vcvt_ppc64_standalone",
 +    ":bf16-qs8-vcvt_ppc64_standalone",
++    ":bf16-qu8-vcvt_ppc64_standalone",
 +    ":bf16-rminmax_ppc64_standalone",
 +    ":configs_ppc64_standalone",
 +    ":enums_ppc64_standalone",
@@ -4397,6 +4468,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ":u8-rdminmax_ppc64_standalone",
 +    ":u8-rminmax_ppc64_standalone",
 +    ":u8-vclamp_ppc64_standalone",
++    ":x16-packw_ppc64_standalone",
 +    ":x16-transposec_ppc64_standalone",
 +    ":x16-x32-packw_ppc64_standalone",
 +    ":x24-transposec_ppc64_standalone",
@@ -4415,7 +4487,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
      ]
    }
  } else {
-@@ -2119,6 +2403,7 @@ if (current_cpu == "x64" || current_cpu
+@@ -2153,6 +2441,7 @@ if (current_cpu == "x64" || current_cpu
    }
  }
  
@@ -4423,7 +4495,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  if (build_with_chromium) {
    source_set("xnnpack") {
      public = [ "src/include/xnnpack.h" ]
-@@ -2129,38 +2414,38 @@ if (build_with_chromium) {
+@@ -2163,39 +2452,39 @@ if (build_with_chromium) {
      configs += [ ":xnnpack_private_config" ]
  
      sources = [
@@ -4453,6 +4525,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      "src/src/subgraph.c",
 -      "src/src/tensor.c",
 -      "src/src/xnnpack/fingerprint_check.c",
+-      "src/src/xnnpack/init-once.c",
 +    "src/src/cache.c",
 +    "src/src/datatype.c",
 +    "src/src/indirection.c",
@@ -4473,7 +4546,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    "src/src/sanitizers.c",
 +    "src/src/subgraph.c",
 +    "src/src/tensor.c",
-+    "src/src/xnnpack/fingerprint_check.c"
++    "src/src/xnnpack/fingerprint_check.c",
++    "src/src/xnnpack/init-once.c"
      ]
  
      deps = xnnpack_deps + [
@@ -4490,7 +4564,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
      public_configs = [ ":xnnpack_public_config" ]
    }
-@@ -2177,38 +2462,38 @@ if (build_with_internal_optimization_gui
+@@ -2212,39 +2501,39 @@ if (build_with_internal_optimization_gui
      configs += [ ":xnnpack_private_config" ]
  
      sources = [
@@ -4520,6 +4594,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      "src/src/subgraph.c",
 -      "src/src/tensor.c",
 -      "src/src/xnnpack/fingerprint_check.c",
+-      "src/src/xnnpack/init-once.c",
 +    "src/src/cache.c",
 +    "src/src/datatype.c",
 +    "src/src/indirection.c",
@@ -4540,7 +4615,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    "src/src/sanitizers.c",
 +    "src/src/subgraph.c",
 +    "src/src/tensor.c",
-+    "src/src/xnnpack/fingerprint_check.c"
++    "src/src/xnnpack/fingerprint_check.c",
++    "src/src/xnnpack/init-once.c"
      ]
  
      deps = xnnpack_standalone_deps + [
@@ -4557,7 +4633,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
      public_configs = [ ":xnnpack_public_config" ]
  
-@@ -2219,63328 +2504,73573 @@ if (build_with_internal_optimization_gui
+@@ -2255,64445 +2544,74828 @@ if (build_with_internal_optimization_gui
  }
  
  if (current_cpu == "x64" || current_cpu == "x86") {
@@ -4853,14 +4929,24 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("bf16-rminmax_x64") {
+-    source_set("bf16-qu8-vcvt_x64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
+-        "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",
 -      ]
 +if (build_with_chromium) {
 +  source_set("bf16-qs8-vcvt_x64") {
@@ -4873,21 +4959,18 @@ Index: chromium-150.0.7871.46/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" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//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_x64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -4895,15 +4978,35 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_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("bf16-rminmax_x64_standalone") {
+-  if (build_with_chromium) {
+-    source_set("bf16-rminmax_x64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -4923,6 +5026,48 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
 -        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("bf16-rminmax_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
+-      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -4943,20 +5088,24 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++if (build_with_chromium) {
++  source_set("bf16-qu8-vcvt_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("configs_x64") {
 -      cflags = []
-+    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" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -4997,12 +5146,16 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
  
@@ -5010,17 +5163,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("configs_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("bf16-rminmax_x64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("bf16-qu8-vcvt_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
++      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      sources = [
@@ -5069,37 +5221,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("enums_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("bf16-rminmax_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -      sources = [
@@ -5122,27 +5257,20 @@ Index: chromium-150.0.7871.46/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("enums_x64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/enums/allocation-type.c",
@@ -5169,11 +5297,20 @@ Index: chromium-150.0.7871.46/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("bf16-rminmax_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-avgpool_f16c-no-avx2-no-fma") {
@@ -5199,48 +5336,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("configs_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/configs/argmaxpool-config.c",
-+    "src/src/configs/avgpool-config.c",
-+    "src/src/configs/binary-elementwise-config.c",
-+    "src/src/configs/cmul-config.c",
-+    "src/src/configs/conv-hwc2chw-config.c",
-+    "src/src/configs/dwconv-config.c",
-+    "src/src/configs/dwconv2d-chw-config.c",
-+    "src/src/configs/gemm-config.c",
-+    "src/src/configs/hardware-config.c",
-+    "src/src/configs/ibilinear-chw-config.c",
-+    "src/src/configs/ibilinear-config.c",
-+    "src/src/configs/lut32norm-config.c",
-+    "src/src/configs/maxpool-config.c",
-+    "src/src/configs/pack-lh-config.c",
-+    "src/src/configs/raddstoreexpminusmax-config.c",
-+    "src/src/configs/reduce-config.c",
-+    "src/src/configs/spmm-config.c",
-+    "src/src/configs/transpose-config.c",
-+    "src/src/configs/unary-elementwise-config.c",
-+    "src/src/configs/unpool-config.c",
-+    "src/src/configs/vmulcaddc-config.c",
-+    "src/src/configs/x8-lut-config.c",
-+    "src/src/configs/xx-fill-config.c",
-+    "src/src/configs/xx-pad-config.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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-avgpool_f16c-no-avx2-no-fma_standalone") {
@@ -5273,13 +5383,6 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -5313,37 +5416,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("configs_x64_standalone") {
++  source_set("bf16-rminmax_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/configs/argmaxpool-config.c",
-+    "src/src/configs/avgpool-config.c",
-+    "src/src/configs/binary-elementwise-config.c",
-+    "src/src/configs/cmul-config.c",
-+    "src/src/configs/conv-hwc2chw-config.c",
-+    "src/src/configs/dwconv-config.c",
-+    "src/src/configs/dwconv2d-chw-config.c",
-+    "src/src/configs/gemm-config.c",
-+    "src/src/configs/hardware-config.c",
-+    "src/src/configs/ibilinear-chw-config.c",
-+    "src/src/configs/ibilinear-config.c",
-+    "src/src/configs/lut32norm-config.c",
-+    "src/src/configs/maxpool-config.c",
-+    "src/src/configs/pack-lh-config.c",
-+    "src/src/configs/raddstoreexpminusmax-config.c",
-+    "src/src/configs/reduce-config.c",
-+    "src/src/configs/spmm-config.c",
-+    "src/src/configs/transpose-config.c",
-+    "src/src/configs/unary-elementwise-config.c",
-+    "src/src/configs/unpool-config.c",
-+    "src/src/configs/vmulcaddc-config.c",
-+    "src/src/configs/x8-lut-config.c",
-+    "src/src/configs/xx-fill-config.c",
-+    "src/src/configs/xx-pad-config.c"
++      "src/src/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" ]
@@ -5466,18 +5548,37 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("enums_x64") {
++  source_set("configs_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/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) {
@@ -5591,18 +5692,37 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("enums_x64_standalone") {
++  source_set("configs_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/configs/argmaxpool-config.c",
++    "src/src/configs/avgpool-config.c",
++    "src/src/configs/binary-elementwise-config.c",
++    "src/src/configs/cmul-config.c",
++    "src/src/configs/conv-hwc2chw-config.c",
++    "src/src/configs/dwconv-config.c",
++    "src/src/configs/dwconv2d-chw-config.c",
++    "src/src/configs/gemm-config.c",
++    "src/src/configs/hardware-config.c",
++    "src/src/configs/ibilinear-chw-config.c",
++    "src/src/configs/ibilinear-config.c",
++    "src/src/configs/lut32norm-config.c",
++    "src/src/configs/maxpool-config.c",
++    "src/src/configs/pack-lh-config.c",
++    "src/src/configs/raddstoreexpminusmax-config.c",
++    "src/src/configs/reduce-config.c",
++    "src/src/configs/spmm-config.c",
++    "src/src/configs/transpose-config.c",
++    "src/src/configs/unary-elementwise-config.c",
++    "src/src/configs/unpool-config.c",
++    "src/src/configs/vmulcaddc-config.c",
++    "src/src/configs/x8-lut-config.c",
++    "src/src/configs/xx-fill-config.c",
++    "src/src/configs/xx-pad-config.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -5718,16 +5838,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-avgpool_f16c-no-avx2-no-fma") {
++  source_set("enums_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c"
++      "src/src/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) {
@@ -5806,33 +5928,76 @@ Index: chromium-150.0.7871.46/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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-avgpool_f16c-no-avx2-no-fma_standalone") {
++  source_set("enums_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c"
++      "src/src/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",
--      ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-f32-vcvt_x64_standalone") {
+-      cflags = []
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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",
@@ -5840,6 +6005,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -5857,12 +6041,17 @@ Index: chromium-150.0.7871.46/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_x64_standalone") {
--      cflags = []
+-    source_set("f16-f32acc-gemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.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" ]
@@ -5885,33 +6074,35 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-dwconv_f16c-fma-no-avx2") {
++  source_set("f16-avgpool_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    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"
++      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-gemm_f16c-fma-avx2") {
+-    source_set(
+-        "f16-f32acc-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
--        "-mavx2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-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",
+-        "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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -5942,17 +6133,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-gemm_f16c-fma-avx2_standalone") {
+-    source_set(
+-        "f16-f32acc-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/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",
+-        "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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6004,19 +6200,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-dwconv_f16c-fma-no-avx2_standalone") {
++  source_set("f16-avgpool_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    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"
++      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -6070,7 +6263,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  if (build_with_chromium) {
 -    source_set(
--        "f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-        "f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
 -        "-mavx512bw",
 -        "-mavx512cd",
@@ -6083,7 +6276,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c",
+-        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x32-minmax-avx512skx-broadcast.c",
+-        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x32-minmax-avx512skx-broadcast.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6109,7 +6303,61 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set(
--        "f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-        "f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x32-minmax-avx512skx-broadcast.c",
+-        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x32-minmax-avx512skx-broadcast.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++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-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
 -        "-mavx512bw",
 -        "-mavx512cd",
@@ -6134,52 +6382,6 @@ Index: chromium-150.0.7871.46/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 (build_with_chromium) {
-+  source_set("f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c"
-+    ]
- 
--  if (build_with_chromium) {
--    source_set("f16-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" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6199,16 +6401,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma_standalone") {
+-    source_set(
+-        "f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c",
+-        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6234,21 +6441,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set(
--        "f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-    source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
 -        "-mf16c",
--        "-mfma",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c",
+-        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6264,17 +6466,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f16-dwconv_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c"
++      "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" ]
@@ -6287,21 +6491,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set(
--        "f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-    source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
 -        "-mf16c",
--        "-mfma",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c",
+-        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6331,16 +6530,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma") {
+-    source_set(
+-        "f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6365,16 +6569,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma_standalone") {
+-    source_set(
+-        "f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6397,38 +6606,30 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-f32-vcvt_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/f16-f32-vcvt/gen/f16-f32-vcvt-avx512skx-u16.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set(
--        "f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-    source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
 -        "-mf16c",
--        "-mfma",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6459,21 +6660,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set(
--        "f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-    source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
 -        "-mf16c",
--        "-mfma",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6499,16 +6695,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma") {
+-    source_set(
+-        "f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c",
+-        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6524,20 +6725,17 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-f32-vcvt_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/f16-f32-vcvt/gen/f16-f32-vcvt-avx512skx-u16.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -6550,16 +6748,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma_standalone") {
+-    source_set(
+-        "f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c",
+-        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6589,21 +6792,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ]
  
 -  if (build_with_chromium) {
--    source_set(
--        "f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-    source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
 -        "-mf16c",
--        "-mfma",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c",
+-        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6628,21 +6826,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set(
--        "f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-    source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
 -        "-mf16c",
--        "-mfma",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c",
+-        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6665,29 +6858,38 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_f16c-no-avx2-no-fma") {
++  source_set("f16-f32-vcvt_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-f32-vcvt/gen/f16-f32-vcvt-f16c-u16.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx512skx-u16.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 = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c",
+-        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6718,6 +6920,97 @@ Index: chromium-150.0.7871.46/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") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-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("f16-f32acc-rsum_f16c-no-avx2-no-fma") {
+-      cflags = [
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++# 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" ]
+ 
+-  # 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") {
 -      cflags = [
 -        "-mf16c",
@@ -6748,10 +7041,111 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        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-gemm_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-gemm/gen/f16-gemm-1x32-minmax-avx512fp16-broadcast.c",
+-        "src/src/f16-gemm/gen/f16-gemm-8x32-minmax-avx512fp16-broadcast.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "f16-gemm_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-gemm/gen/f16-gemm-1x32-minmax-avx512fp16-broadcast.c",
+-        "src/src/f16-gemm/gen/f16-gemm-8x32-minmax-avx512fp16-broadcast.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/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_f16c-no-avx2-no-fma") {
++    cflags = [
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-f16c-u16.c"
++    ]
+ 
 -  if (build_with_chromium) {
 -    source_set("f16-ibilinear_f16c-fma-no-avx2") {
 -      cflags = [
@@ -6776,6 +7170,90 @@ Index: chromium-150.0.7871.46/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",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-ibilinear_f16c-fma-no-avx2_standalone") {
+-      cflags = [
+-        "-mf16c",
+-        "-mfma",
+-        "-mno-avx2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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_f16c-no-avx2-no-fma_standalone") {
@@ -6800,16 +7278,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-ibilinear_f16c-fma-no-avx2_standalone") {
+-    source_set(
+-        "f16-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
 -        "-mfma",
--        "-mno-avx2",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c",
+-        "src/src/f16-igemm/gen/f16-igemm-1x32-minmax-avx512fp16-broadcast.c",
+-        "src/src/f16-igemm/gen/f16-igemm-8x32-minmax-avx512fp16-broadcast.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7316,20 +7803,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-rdminmax_x64_standalone") {
 -      cflags = []
-+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"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
@@ -7355,10 +7829,19 @@ Index: chromium-150.0.7871.46/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-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"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -7391,6 +7874,14 @@ Index: chromium-150.0.7871.46/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",
@@ -7398,12 +7889,6 @@ Index: chromium-150.0.7871.46/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(
@@ -7443,21 +7928,9 @@ Index: chromium-150.0.7871.46/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("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" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -7493,20 +7966,28 @@ Index: chromium-150.0.7871.46/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-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" ]
 -    }
 -  }
-+    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) {
@@ -7549,16 +8030,51 @@ Index: chromium-150.0.7871.46/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-rminmax_f16c-no-avx2-no-fma") {
+-      cflags = [
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-rminmax/f16-rmax-f16c-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" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("f16-rminmax_f16c-no-avx2-no-fma") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-rminmax_f16c-no-avx2-no-fma_standalone") {
 -      cflags = [
 -        "-mf16c",
 -        "-mno-avx2",
@@ -7579,42 +8095,114 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-igemm_f16c-fma-avx2") {
++  source_set("f16-f32acc-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c",
-+    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.c"
++      "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") {
++    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"
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-rminmax_f16c-no-avx2-no-fma_standalone") {
--      cflags = [
--        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
--      ]
--
+-    source_set("f16-rminmax_x64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-rminmax/f16-rmax-f16c-u32.c",
+-        "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
+-        "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
+-        "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7634,21 +8222,66 @@ Index: chromium-150.0.7871.46/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("f16-vapproxgelu_avx512f") {
+-      cflags = [ "-mavx512f" ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "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") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c",
++    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.c"
++    ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//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("f16-rminmax_x64") {
--      cflags = []
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vapproxgelu_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f16-f32acc-igemm_f16c-fma-avx2_standalone") {
@@ -7666,19 +8299,65 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
--        "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
--        "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c",
+-        "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-avx512f-rational-6-4-div.c",
 -      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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-vapproxgelu_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-avx512fp16-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",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -7686,27 +8365,82 @@ Index: chromium-150.0.7871.46/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(
+-        "f16-vapproxgelu_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-avx512fp16-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",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-rminmax_x64_standalone") {
--      cflags = []
+-  if (build_with_chromium) {
+-    source_set("f16-vapproxgelu_f16c-no-avx2-no-fma") {
+-      cflags = [
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-f16c-rational-6-4-div.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -7719,14 +8453,30 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
++      "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x32-minmax-avx512skx-broadcast.c",
++    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x32-minmax-avx512skx-broadcast.c"
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_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-vapproxgelu_f16c-no-avx2-no-fma_standalone") {
+-      cflags = [
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
--        "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
--        "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c",
+-        "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-f16c-rational-6-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7747,11 +8497,6 @@ Index: chromium-150.0.7871.46/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",
@@ -7768,7 +8513,7 @@ Index: chromium-150.0.7871.46/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-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -7781,12 +8526,13 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
++      "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x32-minmax-avx512skx-broadcast.c",
++    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x32-minmax-avx512skx-broadcast.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-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" ]
@@ -7824,21 +8570,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vapproxgelu_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma") {
++  source_set("f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-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" ]
@@ -7989,16 +8739,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -8140,20 +8894,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -8212,20 +8962,16 @@ Index: chromium-150.0.7871.46/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-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c"
 +    ]
  
 -      sources = [
@@ -8293,16 +9039,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma") {
++  source_set("f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-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-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -8385,16 +9135,20 @@ Index: chromium-150.0.7871.46/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-rdsum_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-f32acc-rdsum_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-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
 +    ]
  
 -      sources = [
@@ -8437,6 +9191,163 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vexp_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
++  source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma") {
++    cflags = [
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vexp/gen/f16-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" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-vgelu_x64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_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-rdsum_f16c-no-avx2-no-fma_standalone") {
++    cflags = [
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c"
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vgelu_x64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//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-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",
+-      ]
++if (build_with_chromium) {
 +  source_set("f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
@@ -8453,9 +9364,26 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c"
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # 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-vexp/gen/f16-vexp-scalar-poly-3.c",
+-        "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -8476,11 +9404,6 @@ Index: chromium-150.0.7871.46/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",
@@ -8493,8 +9416,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vgelu_x64") {
--      cflags = []
+-    source_set("f16-vlog_avx512f") {
+-      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
@@ -8515,7 +9438,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
+-        "src/src/f16-vlog/gen/f16-f32acc-vlog-avx512f-rational-1-3-div.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -8550,8 +9473,8 @@ Index: chromium-150.0.7871.46/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 = []
+-    source_set("f16-vlog_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
 +  source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma") {
 +    cflags = [
@@ -8567,7 +9490,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
+-        "src/src/f16-vlog/gen/f16-f32acc-vlog-avx512f-rational-1-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -8595,16 +9518,24 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vhswish_f16c-no-avx2-no-fma") {
+-    source_set(
+-        "f16-vlog_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-vhswish/gen/f16-vhswish-f16c-u16.c",
+-        "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-1-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -8633,16 +9564,24 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vhswish_f16c-no-avx2-no-fma_standalone") {
+-    source_set(
+-        "f16-vlog_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-vhswish/gen/f16-vhswish-f16c-u16.c",
+-        "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-1-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -8679,24 +9618,16 @@ Index: chromium-150.0.7871.46/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-vlog_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-vlog/gen/f16-vlog-avx512fp16-rational-3-3-div.c",
+-        "src/src/f16-vlog/gen/f16-f32acc-vlog-f16c-rational-1-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -8727,24 +9658,16 @@ Index: chromium-150.0.7871.46/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-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
+-    source_set("f16-vlog_f16c-no-avx2-no-fma_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512fp16",
--        "-mavx512vl",
--        "-mavx512vnni",
 -        "-mf16c",
--        "-mfma",
--        "-mgfni",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-3-3-div.c",
+-        "src/src/f16-vlog/gen/f16-f32acc-vlog-f16c-rational-1-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -8778,7 +9701,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c",
+-        "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c",
 -      ]
 +if (build_with_chromium) {
 +  source_set("f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
@@ -8849,7 +9772,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c",
+-        "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9196,16 +10119,24 @@ Index: chromium-150.0.7871.46/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) {
@@ -9288,16 +10219,24 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# 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 = [
@@ -9365,16 +10304,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_f16c-fma-avx2") {
++  source_set("f16-ibilinear_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
++      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -9455,33 +10394,44 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_chromium) {
 -    source_set("f16-vsqrt_x64") {
 -      cflags = []
+-
+-      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" ]
 +# 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-ibilinear_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
++      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.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",
@@ -9489,36 +10439,11 @@ Index: chromium-150.0.7871.46/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-vsqrt_x64_standalone") {
 -      cflags = []
-+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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -9542,39 +10467,50 @@ Index: chromium-150.0.7871.46/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(
--        "f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512fp16",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
+-    source_set("f16-vtanh_avx512f") {
+-      cflags = [ "-mavx512f" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-expm1minus-rr1-p3h2ts-div.c",
+-        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c",
 -      ]
--
++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" ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -9596,24 +10532,33 @@ Index: chromium-150.0.7871.46/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") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512fp16",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
+-    source_set("f16-vtanh_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
++# 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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-expm1minus-rr1-p3h2ts-div.c",
+-        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9635,30 +10580,30 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-maxpool_sse4.1-no-sse4.2_standalone") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-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" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vtanh_f16c-fma-no-avx2") {
+-    source_set(
+-        "f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
 -        "-mfma",
--        "-mno-avx2",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-fma3-polynomial-p19h9t2-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9672,14 +10617,6 @@ Index: chromium-150.0.7871.46/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",
@@ -9687,18 +10624,31 @@ Index: chromium-150.0.7871.46/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("f16-vtanh_f16c-fma-no-avx2_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",
--        "-mno-avx2",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-fma3-polynomial-p19h9t2-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9718,8 +10668,6 @@ Index: chromium-150.0.7871.46/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" ]
      }
@@ -9736,7 +10684,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-f16c-expm1minus-rr1-p3h2ts-rcp-u24.c",
+-        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-f16c-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9751,14 +10699,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_x64") {
++  source_set("f16-maxpool_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -9780,7 +10730,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-f16c-expm1minus-rr1-p3h2ts-rcp-u24.c",
+-        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-f16c-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9817,19 +10767,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qs8-vcvt_x64_standalone") {
++  source_set("f16-maxpool_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-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" ]
@@ -9869,7 +10821,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c",
+-        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9892,14 +10844,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_x64") {
++  source_set("f16-maxpool_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -10007,14 +10960,15 @@ Index: chromium-150.0.7871.46/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_x64_standalone") {
++  source_set("f16-maxpool_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
 +    ]
  
 -  # This is a target that cannot depend on //base.
@@ -10135,16 +11089,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2") {
++  source_set("f16-qs8-vcvt_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-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -10181,16 +11133,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
++  source_set("f16-qs8-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      sources = [
@@ -10306,15 +11256,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_x64") {
++  source_set("f16-qu8-vcvt_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"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -10351,15 +11300,14 @@ Index: chromium-150.0.7871.46/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-rdminmax_x64_standalone") {
++  source_set("f16-qu8-vcvt_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"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      sources = [
@@ -10471,22 +11419,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -10523,22 +11465,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c"
 +    ]
  
 -      sources = [
@@ -10686,25 +11622,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-rdminmax_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -10771,197 +11697,199 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-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",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/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-bf16-vcvt_x64_standalone") {
+-      cflags = []
+-
+-      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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
-+    "-mavx512fp16",
 +    "-mavx512vl",
-+    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
++      "src/src/f16-rminmax/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"
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("f32-conv-hwc2chw_sse-no-sse2") {
+-      cflags = [
+-        "-mno-sse2",
+-        "-msse",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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-bf16-vcvt_x64_standalone") {
--      cflags = []
--
--      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" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/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_f16c-no-avx2-no-fma") {
-+    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/f16-rmax-f16c-u32.c"
-+    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-conv-hwc2chw_sse-no-sse2") {
--      cflags = [
--        "-mno-sse2",
--        "-msse",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-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",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-conv-hwc2chw_sse-no-sse2_standalone") {
--      cflags = [
--        "-mno-sse2",
--        "-msse",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-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: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-conv-hwc2chw_x64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_f16c-no-avx2-no-fma_standalone") {
-+    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/f16-rmax-f16c-u32.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
+-        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-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",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-conv-hwc2chw_sse-no-sse2_standalone") {
+-      cflags = [
+-        "-mno-sse2",
+-        "-msse",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-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: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-conv-hwc2chw_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_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"
++    ]
+ 
+-      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" ]
@@ -10999,16 +11927,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-conv-hwc2chw_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_x64") {
++  source_set("f16-rminmax_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-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-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
 +    ]
  
 -      sources = [
@@ -11116,16 +12053,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_x64_standalone") {
++  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -11208,14 +12154,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-dwconv2d-chw_x64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_x64") {
++  source_set("f16-rminmax_f16c-no-avx2-no-fma") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-rminmax/f16-rmax-f16c-u32.c"
 +    ]
  
 -      sources = [
@@ -11265,14 +12213,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_x64_standalone") {
++  source_set("f16-rminmax_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-rminmax/f16-rmax-f16c-u32.c"
 +    ]
  
 -      sources = [
@@ -11416,41 +12366,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-rminmax_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-avx512fp16-u64.c"
++      "src/src/f16-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" ]
@@ -11531,41 +12456,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-rminmax_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-avx512fp16-u64.c"
++      "src/src/f16-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" ]
@@ -11690,34 +12590,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_f16c-no-avx2-no-fma") {
++  source_set("f16-vapproxgelu_avx512f") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-avx512f-rational-6-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -11772,34 +12652,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vbinary_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vapproxgelu_avx512f_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-avx512f-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -11945,16 +12805,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vclamp_f16c-no-avx2-no-fma") {
++  source_set("f16-vapproxgelu_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-vclamp/gen/f16-vclamp-f16c-u16.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-avx512fp16-rational-6-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -12039,16 +12906,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vclamp_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vapproxgelu_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-vclamp/gen/f16-vclamp-f16c-u16.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-avx512fp16-rational-6-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -12164,14 +13038,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vcos_x64") {
++  source_set("f16-vapproxgelu_f16c-no-avx2-no-fma") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-f16c-rational-6-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -12252,14 +13128,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_x64_standalone") {
++  source_set("f16-vapproxgelu_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-f16c-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -12302,16 +13180,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-f16-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-velu_f16c-fma-avx2") {
++  source_set("f16-vapproxgelu_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -12423,16 +13299,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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-vapproxgelu_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -12442,6 +13316,13 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -12462,13 +13343,6 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -12483,14 +13357,41 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-gemm_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vexp_x64") {
++  source_set("f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f16-vbinary/gen/f16-vadd-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmax-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmin-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vminc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmul-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsub-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-avx512fp16-u64.c"
 +    ]
  
 -      sources = [
@@ -12613,14 +13514,41 @@ Index: chromium-150.0.7871.46/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-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f16-vbinary/gen/f16-vadd-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmax-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmin-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vminc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmul-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsub-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-avx512fp16-u64.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -12707,15 +13635,40 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-gemm_x64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_x64") {
++  source_set("f16-vbinary_f16c-no-avx2-no-fma") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c"
 +    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -12738,20 +13691,15 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -12762,14 +13710,34 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_x64_standalone") {
++  source_set("f16-vbinary_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-vbinary/gen/f16-vadd-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -12886,7 +13854,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vhswish_f16c-no-avx2-no-fma") {
++  source_set("f16-vclamp_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -12895,7 +13863,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-f16c-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -12932,7 +13900,7 @@ Index: chromium-150.0.7871.46/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-vclamp_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -12941,7 +13909,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -13053,23 +14021,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vlog_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-vlog/gen/f16-vlog-avx512fp16-rational-3-3-div.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -13106,23 +14065,14 @@ Index: chromium-150.0.7871.46/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-vcos_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-3-3-div.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -13239,14 +14189,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-igemm_avx512f") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vlog_x64") {
++  source_set("f16-velu_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
++      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -13292,14 +14244,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vlog_x64_standalone") {
++  source_set("f16-velu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
++      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
 +    ]
  
 -      sources = [
@@ -13447,16 +14401,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vlrelu_f16c-no-avx2-no-fma") {
++  source_set("f16-vexp_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -13516,16 +14468,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-vexp_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -      sources = [
@@ -13627,16 +14577,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vmulcaddc_f16c-fma-no-avx2") {
++  source_set("f16-vgelu_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -13694,16 +14642,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vmulcaddc_f16c-fma-no-avx2_standalone") {
++  source_set("f16-vgelu_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -13771,7 +14717,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vrnd_f16c-no-avx2-no-fma") {
++  source_set("f16-vhswish_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -13780,10 +14726,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrnd/gen/f16-vrndd-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndne-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndu-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndz-f16c-u16.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -13892,7 +14835,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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-vhswish_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -13901,10 +14844,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrnd/gen/f16-vrndd-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndne-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndu-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndz-f16c-u16.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -14025,16 +14965,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vrsqrt_f16c-no-avx2-no-fma") {
++  source_set("f16-vlog_avx512f") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-avx512f-rational-1-3-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14117,16 +15055,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vrsqrt_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vlog_avx512f_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-avx512f-rational-1-3-div.c"
 +    ]
  
 -      sources = [
@@ -14196,16 +15132,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsigmoid_f16c-fma-avx2") {
++  source_set("f16-vlog_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-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
++      "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-1-3-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14314,16 +15257,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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-vlog_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-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
++      "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-1-3-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -14458,14 +15408,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsin_x64") {
++  source_set("f16-vlog_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-vlog/gen/f16-f32acc-vlog-f16c-rational-1-3-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14571,14 +15523,16 @@ Index: chromium-150.0.7871.46/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") {
++  source_set("f16-vlog_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-vlog/gen/f16-f32acc-vlog-f16c-rational-1-3-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -14645,16 +15599,14 @@ Index: chromium-150.0.7871.46/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-vsqrt_f16c-no-avx2-no-fma") {
++  source_set("f16-vlog_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -14691,16 +15643,14 @@ Index: chromium-150.0.7871.46/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-vlog_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
 +    ]
  
 -      sources = [
@@ -14833,14 +15783,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_x64") {
++  source_set("f16-vlrelu_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-vlrelu/gen/f16-vlrelu-f16c-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -14925,14 +15877,16 @@ Index: chromium-150.0.7871.46/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") {
++  source_set("f16-vlrelu_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-vlrelu/gen/f16-vlrelu-f16c-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -15053,23 +16007,16 @@ Index: chromium-150.0.7871.46/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-vmulcaddc_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
++      "-mf16c",
 +    "-mfma",
-+    "-mgfni"
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-expm1minus-rr1-p3h2ts-div.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15150,23 +16097,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-vmulcaddc_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
++      "-mf16c",
 +    "-mfma",
-+    "-mgfni"
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-expm1minus-rr1-p3h2ts-div.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
 +    ]
  
 -      sources = [
@@ -15236,16 +16176,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_f16c-fma-no-avx2") {
++  source_set("f16-vrnd_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-fma3-polynomial-p19h9t2-u32.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) {
@@ -15351,16 +16294,19 @@ Index: chromium-150.0.7871.46/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-no-avx2_standalone") {
++  source_set("f16-vrnd_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-fma3-polynomial-p19h9t2-u32.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -15488,7 +16434,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_f16c-no-avx2-no-fma") {
++  source_set("f16-vrsqrt_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -15497,7 +16443,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-f16c-expm1minus-rr1-p3h2ts-rcp-u24.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15578,7 +16524,7 @@ Index: chromium-150.0.7871.46/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-vrsqrt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -15587,7 +16533,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-f16c-expm1minus-rr1-p3h2ts-rcp-u24.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -      sources = [
@@ -15631,14 +16577,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-qu8-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_x64") {
++  source_set("f16-vsigmoid_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
 +    ]
  
 -      sources = [
@@ -15686,14 +16634,16 @@ Index: chromium-150.0.7871.46/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-vsigmoid_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
 +    ]
  
 -      sources = [
@@ -15736,16 +16686,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-raddstoreexpminusmax_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vunary_f16c-no-avx2-no-fma") {
++  source_set("f16-vsin_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
++      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -15849,16 +16797,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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-vsin_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
++      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15973,16 +16919,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vunary_sse2-no-sse3") {
++  source_set("f16-vsqrt_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-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -16040,16 +16986,16 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
++  source_set("f16-vsqrt_f16c-no-avx2-no-fma_standalone") {
 +    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-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -      sources = [
@@ -16117,15 +17063,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_sse2-no-sse3") {
++  source_set("f16-vsqrt_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16212,15 +17157,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_sse2-no-sse3_standalone") {
++  source_set("f16-vsqrt_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -16290,14 +17234,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_x64") {
++  source_set("f16-vtanh_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16380,14 +17324,14 @@ Index: chromium-150.0.7871.46/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_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -16457,17 +17401,23 @@ Index: chromium-150.0.7871.46/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-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16552,17 +17502,23 @@ Index: chromium-150.0.7871.46/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-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -16630,14 +17586,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_avx512f") {
++  source_set("f16-vtanh_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    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-f16c-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16718,14 +17676,16 @@ Index: chromium-150.0.7871.46/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_avx512f_standalone") {
++  source_set("f16-vtanh_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    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-f16c-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -16793,15 +17753,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_sse2-no-sse3") {
++  source_set("f16-vtanh_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16886,15 +17845,14 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
++  source_set("f16-vtanh_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -16962,14 +17920,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_x64") {
++  source_set("f16-vunary_f16c-no-avx2-no-fma") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17050,14 +18010,16 @@ Index: chromium-150.0.7871.46/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_x64_standalone") {
++  source_set("f16-vunary_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -17125,20 +18087,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-vunary_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/f16-vunary/gen/f16-vabs-sse2-u16.c",
++    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17227,20 +18185,16 @@ Index: chromium-150.0.7871.46/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_standalone") {
++  source_set("f16-vunary_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/f16-vunary/gen/f16-vabs-sse2-u16.c",
++    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
 +    ]
  
 -      sources = [
@@ -17312,23 +18266,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16") {
++  source_set("f32-argmaxpool_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bf16",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512bf16-u16.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17413,23 +18359,15 @@ Index: chromium-150.0.7871.46/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-avx512vnni-gfni-avx512bf16_standalone") {
++  source_set("f32-argmaxpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bf16",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512bf16-u16.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
 +    ]
  
 -      sources = [
@@ -17501,14 +18439,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_x64") {
++  source_set("f32-argmaxpool_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17593,14 +18531,14 @@ Index: chromium-150.0.7871.46/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-argmaxpool_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -      sources = [
@@ -17668,15 +18606,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_sse-no-sse2") {
++  source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17757,15 +18697,17 @@ Index: chromium-150.0.7871.46/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_sse-no-sse2_standalone") {
++  source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-u8.c"
 +    ]
  
 -      sources = [
@@ -17833,14 +18775,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_x64") {
++  source_set("f32-avgpool_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17925,14 +18867,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_x64_standalone") {
++  source_set("f32-avgpool_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-u16.c"
 +    ]
  
 -      sources = [
@@ -18000,18 +18942,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_sse-no-sse2") {
++  source_set("f32-avgpool_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-sse2-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18092,18 +19031,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_sse-no-sse2_standalone") {
++  source_set("f32-avgpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-sse2-u4.c"
 +    ]
  
 -      sources = [
@@ -18171,15 +19107,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1") {
++  source_set("f32-avgpool_x64") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18260,15 +19195,14 @@ Index: chromium-150.0.7871.46/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-avgpool_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -18340,21 +19274,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_x64") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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-avx512skx-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18439,21 +19372,20 @@ Index: chromium-150.0.7871.46/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_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx512skx-u16.c"
 +    ]
  
 -      sources = [
@@ -18496,20 +19428,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vapproxgelu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512bf16",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-avx512bf16-u16.c"
 +    ]
  
 -      sources = [
@@ -18613,20 +19548,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512bf16",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-avx512bf16-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18716,17 +19654,14 @@ Index: chromium-150.0.7871.46/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-dwconv_avx512f") {
++  source_set("f32-bf16-vcvt_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    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-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -18763,17 +19698,14 @@ Index: chromium-150.0.7871.46/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_avx512f_standalone") {
++  source_set("f32-bf16-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    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-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -18919,22 +19851,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_chromium) {
 -    source_set("f32-vbinary_avx512f") {
 -      cflags = [ "-mavx512f" ]
-+if (build_with_chromium) {
-+  source_set("f32-dwconv_f16c-fma-no-avx2") {
-+    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"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vbinary/gen/f32-vadd-avx512f-u32.c",
@@ -18969,44 +19886,36 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++if (build_with_chromium) {
++  source_set("f32-conv-hwc2chw_sse-no-sse2") {
++    cflags = [
++      "-mno-sse2",
++    "-msse"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vbinary_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
 +    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-vbinary_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_f16c-fma-no-avx2_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"
-+    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -19049,11 +19958,9 @@ Index: chromium-150.0.7871.46/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-vbinary_sse-no-sse2") {
@@ -19093,17 +20000,26 @@ Index: chromium-150.0.7871.46/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("f32-conv-hwc2chw_sse-no-sse2_standalone") {
++    cflags = [
++      "-mno-sse2",
++    "-msse"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.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) {
@@ -19150,11 +20066,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-vbinary_sse2-no-sse3") {
@@ -19181,28 +20100,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-dwconv_sse-no-sse2") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-sse.c"
-+    ]
++    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) {
@@ -19237,36 +20142,26 @@ Index: chromium-150.0.7871.46/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("f32-vbinary_x64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_sse-no-sse2_standalone") {
+-  }
++if (build_with_chromium) {
++  source_set("f32-conv-hwc2chw_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-sse.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("f32-vbinary_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-vbinary/gen/f32-vadd-scalar-u8.c",
@@ -19301,26 +20196,34 @@ Index: chromium-150.0.7871.46/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-vbinary_x64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-conv-hwc2chw_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -19362,11 +20265,12 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-vclamp_avx-no-avx2-no-f16c-no-fma") {
@@ -19393,33 +20297,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-dwconv_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
 -  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    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) {
@@ -19453,61 +20341,43 @@ Index: chromium-150.0.7871.46/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-vclamp_avx512f") {
 -      cflags = [ "-mavx512f" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_x64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-dwconv2d-chw_sse-no-sse2") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-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 = [
--        "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" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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",
@@ -19515,12 +20385,16 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
  
@@ -19528,7 +20402,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-vclamp_avx512f_standalone") {
 -      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") {
++    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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c",
@@ -19553,19 +20442,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c"
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-vclamp_sse2-no-sse3") {
@@ -19590,21 +20470,18 @@ Index: chromium-150.0.7871.46/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-vclamp_sse2-no-sse3_standalone") {
@@ -19635,83 +20512,61 @@ Index: chromium-150.0.7871.46/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-vclamp_x64") {
 -      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") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-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" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1") {
++    cflags = [
++      "-mno-sse4.1",
++    "-mssse3"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-vclamp_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -19737,18 +20592,6 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -19758,20 +20601,15 @@ Index: chromium-150.0.7871.46/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-dwconv2d-chw_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
 +    ]
  
 -      sources = [
@@ -19814,16 +20652,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vcmul_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_f16c-no-avx2-no-fma") {
++  source_set("f32-dwconv2d-chw_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-u16.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 = [
@@ -19927,16 +20770,21 @@ Index: chromium-150.0.7871.46/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-dwconv2d-chw_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-u16.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) {
@@ -20024,15 +20872,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_sse2-no-sse3") {
++  source_set("f32-dwconv_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-f16-vcvt/gen/f32-f16-vcvt-sse2-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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -20069,15 +20922,20 @@ Index: chromium-150.0.7871.46/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_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-f16-vcvt/gen/f32-f16-vcvt-sse2-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 = [
@@ -20199,15 +21057,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_sse4.1-no-sse4.2") {
++  source_set("f32-dwconv_avx512f") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -20244,15 +21104,17 @@ Index: chromium-150.0.7871.46/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_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.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 = [
@@ -20372,14 +21234,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_x64") {
++  source_set("f32-dwconv_f16c-fma-no-avx2") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-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" ]
@@ -20416,14 +21283,19 @@ Index: chromium-150.0.7871.46/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_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-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 = [
@@ -20541,20 +21413,18 @@ Index: chromium-150.0.7871.46/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-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-dwconv_sse-no-sse2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-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" ]
@@ -20591,20 +21461,18 @@ Index: chromium-150.0.7871.46/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-dwconv_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-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 = [
@@ -20734,17 +21602,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-gemm_avx512f") {
++  source_set("f32-dwconv_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    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-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" ]
@@ -20803,17 +21677,23 @@ Index: chromium-150.0.7871.46/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_avx512f_standalone") {
++  source_set("f32-dwconv_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    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-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 = [
@@ -20881,24 +21761,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-gemm_f16c-fma-no-avx2") {
++  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-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-avx-u24.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -20983,24 +21856,17 @@ Index: chromium-150.0.7871.46/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_f16c-fma-no-avx2_standalone") {
++  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-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-avx-u24.c"
 +    ]
  
 -      sources = [
@@ -21043,17 +21909,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-velu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-gemm_sse-no-sse2") {
++  source_set("f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx512skx-u16.c"
 +    ]
  
 -      sources = [
@@ -21157,17 +22026,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx512skx-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -21255,19 +22127,16 @@ Index: chromium-150.0.7871.46/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-gemm_x64") {
++  source_set("f32-f16-vcvt_f16c-no-avx2-no-fma") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    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-f16c-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -21304,19 +22173,16 @@ Index: chromium-150.0.7871.46/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_x64_standalone") {
++  source_set("f32-f16-vcvt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    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-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -21432,15 +22298,15 @@ Index: chromium-150.0.7871.46/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-ibilinear-chw_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-ibilinear-chw/gen/f32-ibilinear-chw-sse-p8.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -21477,15 +22343,15 @@ Index: chromium-150.0.7871.46/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-ibilinear-chw_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-ibilinear-chw/gen/f32-ibilinear-chw-sse-p8.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.c"
 +    ]
  
 -      sources = [
@@ -21615,14 +22481,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_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-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -21681,14 +22548,15 @@ Index: chromium-150.0.7871.46/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_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-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.c"
 +    ]
  
 -      sources = [
@@ -21756,15 +22624,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_sse-no-sse2") {
++  source_set("f32-f16-vcvt_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-sse-u8.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -21849,15 +22716,14 @@ Index: chromium-150.0.7871.46/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-ibilinear_sse-no-sse2_standalone") {
++  source_set("f32-f16-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-sse-u8.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      sources = [
@@ -21900,14 +22766,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vgelu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_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/gen/f32-ibilinear-scalar-u2.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 = [
@@ -22011,14 +22883,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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_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/gen/f32-ibilinear-scalar-u2.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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -22108,20 +22986,17 @@ Index: chromium-150.0.7871.46/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-igemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-gemm_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    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-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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -22158,20 +23033,17 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-gemm_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    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-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"
 +    ]
  
 -      sources = [
@@ -22287,17 +23159,24 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-igemm_avx512f") {
++  source_set("f32-gemm_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -22334,17 +23213,24 @@ Index: chromium-150.0.7871.46/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-igemm_avx512f_standalone") {
++  source_set("f32-gemm_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-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 = [
@@ -22474,23 +23360,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-igemm_f16c-fma-no-avx2") {
++  source_set("f32-gemm_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-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -22549,23 +23429,17 @@ Index: chromium-150.0.7871.46/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_f16c-fma-no-avx2_standalone") {
++  source_set("f32-gemm_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"
++      "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 = [
@@ -22608,17 +23482,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vhswish_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-igemm_sse-no-sse2") {
++  source_set("f32-gemm_x64") {
 +    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-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 = [
@@ -22665,17 +23541,19 @@ Index: chromium-150.0.7871.46/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-igemm_sse-no-sse2_standalone") {
++  source_set("f32-gemm_x64_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-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 = [
@@ -22718,19 +23596,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vlog_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-igemm_x64") {
++  source_set("f32-ibilinear-chw_sse-no-sse2") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-sse-p8.c"
 +    ]
  
 -      sources = [
@@ -22834,19 +23708,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-sse-p8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -22952,15 +23822,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_sse2-no-sse3") {
++  source_set("f32-ibilinear-chw_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-sse2-u4.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -23019,15 +23888,14 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
++  source_set("f32-ibilinear-chw_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-sse2-u4.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -      sources = [
@@ -23095,14 +23963,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_x64") {
++  source_set("f32-ibilinear_sse-no-sse2") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-sse-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -23187,14 +24056,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_x64_standalone") {
++  source_set("f32-ibilinear_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-sse-u8.c"
 +    ]
  
 -      sources = [
@@ -23237,18 +24107,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vlrelu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-ibilinear_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    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-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -23350,18 +24216,14 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-ibilinear_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    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-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -23449,17 +24311,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_f16c-fma-avx2") {
++  source_set("f32-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/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-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" ]
@@ -23496,17 +24361,20 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
++  source_set("f32-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/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-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 = [
@@ -23618,17 +24486,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_f16c-fma-no-avx2") {
++  source_set("f32-igemm_avx512f") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx512f"
 +    ]
 +  
 +    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-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" ]
@@ -23665,17 +24533,17 @@ Index: chromium-150.0.7871.46/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_f16c-fma-no-avx2_standalone") {
++  source_set("f32-igemm_avx512f_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx512f"
 +    ]
 +  
 +    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-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 = [
@@ -23812,16 +24680,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_sse4.1-no-sse4.2") {
++  source_set("f32-igemm_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -23901,16 +24776,23 @@ Index: chromium-150.0.7871.46/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_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-igemm_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -24034,15 +24916,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_x64") {
++  source_set("f32-igemm_sse-no-sse2") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -24091,15 +24975,17 @@ Index: chromium-150.0.7871.46/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_x64_standalone") {
++  source_set("f32-igemm_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-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 = [
@@ -24166,11 +25052,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
++
++    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" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -24205,61 +25095,92 @@ Index: chromium-150.0.7871.46/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-igemm_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-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-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-igemm_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    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-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" ]
+-      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",
 -      ]
-+    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" ]
+     }
    }
 +}
  
@@ -24267,20 +25188,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  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-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++if (build_with_chromium) {
++  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"
 +    ]
  
 -      sources = [
@@ -24307,11 +25224,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f32-vrsqrt_sse2-no-sse3") {
@@ -24337,17 +25264,39 @@ Index: chromium-150.0.7871.46/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-maxpool_sse2-no-sse3_standalone") {
++    cflags = [
++      "-mno-sse3",
++    "-msse2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-sse2-u4.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -24380,60 +25329,82 @@ Index: chromium-150.0.7871.46/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-maxpool_x64") {
++    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" ]
++
++    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-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-qc8w-gemm_f16c-fma-avx2") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  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"
 +    ]
  
--      configs -= [ "//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-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",
 -      ]
-+    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" ]
+     }
    }
 +}
  
@@ -24441,19 +25412,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  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-qc8w-gemm_f16c-fma-avx2_standalone") {
++if (build_with_chromium) {
++  source_set("f32-qc4w-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-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-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 = [
@@ -24480,11 +25451,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma") {
@@ -24511,17 +25492,42 @@ Index: chromium-150.0.7871.46/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-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/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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    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" ]
--    }
--  }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -24555,65 +25561,87 @@ Index: chromium-150.0.7871.46/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-qc4w-gemm_f16c-fma-avx2") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-vsigmoid_avx512f") {
 -      cflags = [ "-mavx512f" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-qc4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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"
++      "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" ]
+-      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",
 -      ]
-+    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" ]
+     }
    }
 +}
  
@@ -24621,25 +25649,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-vsigmoid_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++if (build_with_chromium) {
++  source_set("f32-qc4w-gemm_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-fma3-broadcast.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-fma3-broadcast.c"
 +    ]
  
 -      sources = [
@@ -24699,13 +25720,14 @@ Index: chromium-150.0.7871.46/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) {
@@ -24738,11 +25760,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-qc4w-gemm_f16c-fma-no-avx2_standalone") {
++    cflags = [
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
++    ]
++  
++    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"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-vsigmoid_sse2-no-sse3") {
@@ -24767,22 +25800,19 @@ Index: chromium-150.0.7871.46/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" ]
 -    }
 -  }
-+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"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  # This is a target that cannot depend on //base.
@@ -24815,20 +25845,11 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -24856,41 +25877,26 @@ Index: chromium-150.0.7871.46/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-qc8w-gemm_f16c-fma-no-avx2_standalone") {
++if (build_with_chromium) {
++  source_set("f32-qc4w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-1x8-minmax-sse41-dup.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-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" ]
-+
-+    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) {
@@ -24924,24 +25930,6 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -24958,7 +25946,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-qc4w-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -24966,8 +25954,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-1x8-minmax-sse41-dup.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-sse41-dup.c"
 +    ]
  
 -      sources = [
@@ -25010,15 +25998,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vsigmoid_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_x64") {
++  source_set("f32-qc4w-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"
++      "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 = [
@@ -25087,15 +26075,15 @@ Index: chromium-150.0.7871.46/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_x64_standalone") {
++  source_set("f32-qc4w-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"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -25153,7 +26141,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -25163,7 +26151,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -25187,7 +26176,7 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -25197,7 +26186,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.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"
 +    ]
  
 -      sources = [
@@ -25240,7 +26230,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vsin_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_f16c-fma-avx2") {
++  source_set("f32-qc8w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -25249,7 +26239,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-avx2-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx2-broadcast.c"
 +    ]
  
 -      sources = [
@@ -25353,7 +26344,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
++  source_set("f32-qc8w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -25362,7 +26353,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-avx2-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx2-broadcast.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -25393,15 +26385,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -25443,7 +26435,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -25456,7 +26448,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c"
++      "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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -25480,7 +26475,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -25493,7 +26488,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c"
++      "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"
 +    ]
  
 -      sources = [
@@ -25536,15 +26534,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vsin_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_sse2-no-sse3") {
++  source_set("f32-qc8w-gemm_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c"
++      "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"
 +    ]
  
 -      sources = [
@@ -25614,15 +26614,17 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
++  source_set("f32-qc8w-gemm_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c"
++      "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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -25636,10 +26638,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    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" ]
      }
@@ -25681,7 +26683,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_sse4.1-no-sse4.2") {
++  source_set("f32-qc8w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -25689,7 +26691,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c"
++      "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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -25713,7 +26716,7 @@ Index: chromium-150.0.7871.46/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_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -25721,7 +26724,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c"
++      "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"
 +    ]
  
 -      sources = [
@@ -25764,15 +26768,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vsqrt_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_x64") {
++  source_set("f32-qc8w-gemm_x64") {
 +    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-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -25840,30 +26844,30 @@ Index: chromium-150.0.7871.46/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_x64_standalone") {
++  source_set("f32-qc8w-gemm_x64_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-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      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" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -25905,7 +26909,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -25915,7 +26919,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -25939,7 +26943,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -25949,7 +26953,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c"
 +    ]
  
 -      sources = [
@@ -25992,7 +26996,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vsqrt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_f16c-fma-avx2") {
++  source_set("f32-qs8-vcvt_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -26001,7 +27005,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx2-u64.c"
 +    ]
  
 -      sources = [
@@ -26070,7 +27074,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
++  source_set("f32-qs8-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -26079,7 +27083,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -26093,10 +27097,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    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" ]
      }
@@ -26137,7 +27141,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -26150,7 +27154,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -26174,7 +27178,7 @@ Index: chromium-150.0.7871.46/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-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -26187,7 +27191,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c"
 +    ]
  
 -      sources = [
@@ -26230,7 +27234,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vtanh_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_sse2-no-sse3") {
++  source_set("f32-qs8-vcvt_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -26238,7 +27242,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c"
 +    ]
  
 -      sources = [
@@ -26342,7 +27346,7 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
++  source_set("f32-qs8-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -26350,7 +27354,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -26431,15 +27435,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_x64") {
++  source_set("f32-qs8-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -26463,15 +27467,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_x64_standalone") {
++  source_set("f32-qs8-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c"
 +    ]
  
 -      sources = [
@@ -26514,14 +27518,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vtanh_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_avx512f") {
++  source_set("f32-qs8-vcvt_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-u64-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 = [
@@ -26592,14 +27597,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_avx512f_standalone") {
++  source_set("f32-qs8-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-u64-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" ]
@@ -26659,16 +27665,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_f16c-fma-avx2") {
++  source_set("f32-qu8-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/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -26692,16 +27699,17 @@ Index: chromium-150.0.7871.46/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-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
++  source_set("f32-qu8-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/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c"
 +    ]
  
 -      sources = [
@@ -26746,20 +27754,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vunary_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-qu8-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
 +    ]
  
 -      sources = [
@@ -26830,20 +27834,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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") {
++  source_set("f32-qu8-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -26901,15 +27901,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_sse2-no-sse3") {
++  source_set("f32-qu8-vcvt_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/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -26933,15 +27938,20 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
++  source_set("f32-qu8-vcvt_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/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c"
 +    ]
  
 -      sources = [
@@ -26986,14 +27996,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vunary_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_x64") {
++  source_set("f32-qu8-vcvt_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c"
 +    ]
  
 -      sources = [
@@ -27042,14 +28053,15 @@ Index: chromium-150.0.7871.46/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_x64_standalone") {
++  source_set("f32-qu8-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c"
 +    ]
  
 -      sources = [
@@ -27187,18 +28199,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-qu8-vcvt_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -27282,18 +28291,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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") {
++  source_set("f32-qu8-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -27415,15 +28421,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_avx512f") {
++  source_set("f32-raddstoreexpminusmax_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx512f-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx512f-u32.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -27447,15 +28452,14 @@ Index: chromium-150.0.7871.46/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_avx512f_standalone") {
++  source_set("f32-raddstoreexpminusmax_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx512f-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx512f-u32.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-u64-acc2.c"
 +    ]
  
 -      sources = [
@@ -27498,16 +28502,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc2w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_sse2-no-sse3") {
++  source_set("f32-raddstoreexpminusmax_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-sse2-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-sse2-u32.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c"
 +    ]
  
 -      sources = [
@@ -27617,16 +28621,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_sse2-no-sse3_standalone") {
++  source_set("f32-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-sse2-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-sse2-u32.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -27740,15 +28744,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_x64") {
++  source_set("f32-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -27841,15 +28850,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_x64_standalone") {
++  source_set("f32-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -27980,17 +28994,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-raddstoreexpminusmax_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -28102,17 +29114,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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") {
++  source_set("f32-raddstoreexpminusmax_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -28250,14 +29260,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_avx512f") {
++  source_set("f32-raddstoreexpminusmax_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx512f.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -28384,14 +29394,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_avx512f_standalone") {
++  source_set("f32-raddstoreexpminusmax_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx512f.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -28514,15 +29524,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_sse2-no-sse3") {
++  source_set("f32-rdminmax_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.c"
++      "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) {
@@ -28645,15 +29658,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_sse2-no-sse3_standalone") {
++  source_set("f32-rdminmax_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.c"
++      "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" ]
@@ -28798,14 +29814,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_x64") {
++  source_set("f32-rdminmax_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "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) {
@@ -28914,14 +29931,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_x64_standalone") {
++  source_set("f32-rdminmax_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx512f-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx512f-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -29054,17 +30072,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-rdminmax_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-u32.c"
++      "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) {
@@ -29184,17 +30201,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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") {
++  source_set("f32-rdminmax_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-u32.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-sse2-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-sse2-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -29311,14 +30327,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_avx512f") {
++  source_set("f32-rdminmax_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-u64.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -29342,14 +30359,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_avx512f_standalone") {
++  source_set("f32-rdminmax_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-u64.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -29393,15 +30411,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qb4w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_sse2-no-sse3") {
++  source_set("f32-rdsum2_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-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx.c"
 +    ]
  
 -      sources = [
@@ -29512,15 +30532,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_sse2-no-sse3_standalone") {
++  source_set("f32-rdsum2_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-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -29603,14 +30625,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_x64") {
++  source_set("f32-rdsum2_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx512f.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -29634,14 +30656,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_x64_standalone") {
++  source_set("f32-rdsum2_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx512f.c"
 +    ]
  
 -      sources = [
@@ -29684,19 +30706,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc2w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-rdsum2_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-avx-u32-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-avx-u32-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-avx-u32-acc4.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.c"
 +    ]
  
 -      sources = [
@@ -29806,19 +30824,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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") {
++  source_set("f32-rdsum2_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-avx-u32-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-avx-u32-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-avx-u32-acc4.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -29934,16 +30948,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_avx512f") {
++  source_set("f32-rdsum2_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-avx512f-u64-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-avx512f-u64-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-avx512f-u64-acc4.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -30038,16 +31050,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_avx512f_standalone") {
++  source_set("f32-rdsum2_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-avx512f-u64-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-avx512f-u64-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-avx512f-u64-acc4.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -30188,17 +31198,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_sse-no-sse2") {
++  source_set("f32-rdsum_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-sse-u16-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-sse-u16-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-sse-u16-acc4.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -30322,17 +31332,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_sse-no-sse2_standalone") {
++  source_set("f32-rdsum_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-sse-u16-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-sse-u16-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-sse-u16-acc4.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -30449,16 +31459,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_x64") {
++  source_set("f32-rdsum_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -30482,16 +31490,14 @@ Index: chromium-150.0.7871.46/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_x64_standalone") {
++  source_set("f32-rdsum_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-u64.c"
 +    ]
  
 -      sources = [
@@ -30535,17 +31541,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc4w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-rdsum_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-avx-u8.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
 +    ]
  
 -      sources = [
@@ -30656,17 +31660,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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") {
++  source_set("f32-rdsum_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-avx-u8.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -30782,14 +31784,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_avx512f") {
++  source_set("f32-rdsum_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-avx512f-u16.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -30884,14 +31886,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_avx512f_standalone") {
++  source_set("f32-rdsum_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-avx512f-u16.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -31036,15 +32038,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_sse2-no-sse3") {
++  source_set("f32-rminmax_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-rsum2/gen/f32-rsum2-sse2-u4.c"
++      "src/src/f32-rminmax/gen/f32-rmax-avx-u32-acc4.c",
++    "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) {
@@ -31148,15 +32154,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_sse2-no-sse3_standalone") {
++  source_set("f32-rminmax_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-rsum2/gen/f32-rsum2-sse2-u4.c"
++      "src/src/f32-rminmax/gen/f32-rmax-avx-u32-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-avx-u32-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-avx-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31170,10 +32180,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    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" ]
      }
@@ -31213,14 +32223,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_x64") {
++  source_set("f32-rminmax_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-rminmax/gen/f32-rmax-avx512f-u64-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-avx512f-u64-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-avx512f-u64-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31244,14 +32256,16 @@ Index: chromium-150.0.7871.46/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_x64_standalone") {
++  source_set("f32-rminmax_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-rminmax/gen/f32-rmax-avx512f-u64-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-avx512f-u64-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-avx512f-u64-acc4.c"
 +    ]
  
 -      sources = [
@@ -31296,17 +32310,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rsum_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-rminmax_sse-no-sse2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-avx-u32-acc4.c"
++      "src/src/f32-rminmax/gen/f32-rmax-sse-u16-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-sse-u16-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-sse-u16-acc4.c"
 +    ]
  
 -      sources = [
@@ -31418,17 +32432,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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") {
++  source_set("f32-rminmax_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-avx-u32-acc4.c"
++      "src/src/f32-rminmax/gen/f32-rmax-sse-u16-acc4.c",
++    "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) {
@@ -31544,14 +32558,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum_avx512f") {
++  source_set("f32-rminmax_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-acc2.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -31646,14 +32662,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_avx512f_standalone") {
++  source_set("f32-rminmax_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-acc2.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -31798,15 +32816,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rsum_sse2-no-sse3") {
++  source_set("f32-rsum2_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-rsum/gen/f32-rsum-sse2-u16-acc4.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-avx-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -31910,15 +32930,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_sse2-no-sse3_standalone") {
++  source_set("f32-rsum2_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-rsum/gen/f32-rsum-sse2-u16-acc4.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-avx-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31932,10 +32954,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    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" ]
      }
@@ -31975,14 +32997,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rsum_x64") {
++  source_set("f32-rsum2_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-avx512f-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32006,14 +33028,14 @@ Index: chromium-150.0.7871.46/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_x64_standalone") {
++  source_set("f32-rsum2_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-avx512f-u16.c"
 +    ]
  
 -      sources = [
@@ -32058,15 +33080,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-igemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-spmm_sse-no-sse2") {
++  source_set("f32-rsum2_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-sse.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-sse2-u4.c"
 +    ]
  
 -      sources = [
@@ -32176,15 +33198,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_sse-no-sse2_standalone") {
++  source_set("f32-rsum2_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-sse.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-sse2-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -32298,16 +33320,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-spmm_x64") {
++  source_set("f32-rsum2_x64") {
 +    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" ]
@@ -32393,16 +33413,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_x64_standalone") {
++  source_set("f32-rsum2_x64_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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -32520,7 +33538,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-rsum_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -32530,7 +33548,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-avx-u32-acc4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -32579,7 +33597,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      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") {
++  source_set("f32-rsum_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -32589,7 +33607,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-avx-u32-acc4.c"
 +    ]
  
 -      sources = [
@@ -32723,14 +33741,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_avx512f") {
++  source_set("f32-rsum_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -32811,14 +33829,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_avx512f_standalone") {
++  source_set("f32-rsum_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -32946,16 +33964,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_f16c-fma-no-avx2") {
++  source_set("f32-rsum_sse2-no-sse3") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-fma3-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-sse2-u16-acc4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -33056,16 +34073,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_f16c-fma-no-avx2_standalone") {
++  source_set("f32-rsum_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-fma3-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-sse2-u16-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33121,16 +34137,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_sse2-no-sse3") {
++  source_set("f32-rsum_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33154,16 +34168,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_sse2-no-sse3_standalone") {
++  source_set("f32-rsum_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
@@ -33206,14 +34218,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-f32-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_x64") {
++  source_set("f32-spmm_sse-no-sse2") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-sse.c"
 +    ]
  
 -      sources = [
@@ -33323,14 +34336,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_x64_standalone") {
++  source_set("f32-spmm_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-sse.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -33444,35 +34458,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-spmm_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-avx-u16.c"
++      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -33539,35 +34534,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      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") {
++  source_set("f32-spmm_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-avx-u16.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-avx-u16.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 = [
@@ -33669,32 +34645,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_avx512f") {
++  source_set("f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-avx512f-u32.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-rational-12-10-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -33778,32 +34739,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_avx512f_standalone") {
++  source_set("f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-avx512f-u32.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-avx512f-u32.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-rational-12-10-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -33934,30 +34880,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_sse-no-sse2") {
++  source_set("f32-vapproxgelu_avx512f") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-sse-u8.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -34006,30 +34936,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_sse-no-sse2_standalone") {
++  source_set("f32-vapproxgelu_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-sse-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-sse-u8.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -34169,17 +35083,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_sse2-no-sse3") {
++  source_set("f32-vapproxgelu_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vprelu-sse2-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-sse2-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-sse2-u8.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-fma3-rational-12-10-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -34263,17 +35176,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_sse2-no-sse3_standalone") {
++  source_set("f32-vapproxgelu_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vprelu-sse2-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-sse2-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-sse2-u8.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-fma3-rational-12-10-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -34408,32 +35320,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_x64") {
++  source_set("f32-vapproxgelu_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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) {
@@ -34551,34 +35447,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_x64_standalone") {
++  source_set("f32-vapproxgelu_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -34592,8 +35473,7 @@ Index: chromium-150.0.7871.46/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" ]
      }
@@ -34633,17 +35513,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vapproxgelu_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-avx.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34667,17 +35544,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vapproxgelu_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-avx.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -34721,14 +35595,35 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc4w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_avx512f") {
++  source_set("f32-vbinary_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c"
++      "src/src/f32-vbinary/gen/f32-vadd-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vmax-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vmin-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vminc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vmul-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vsub-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-avx-u16.c"
 +    ]
  
 -      sources = [
@@ -34762,19 +35657,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") {
+-    source_set("qs8-qc4w-packw_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-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-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" ]
@@ -34803,19 +35698,19 @@ Index: chromium-150.0.7871.46/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-packw_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-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-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" ]
@@ -34839,29 +35734,56 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_avx512f_standalone") {
++  source_set("f32-vbinary_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c"
++      "src/src/f32-vbinary/gen/f32-vadd-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vmax-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vmin-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vminc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vmul-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vsub-avx-u16.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-avx-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-qc8w-dwconv_f16c-fma-avx2") {
+-    source_set(
+-        "qs8-qc4w-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 -      cflags = [
--        "-mavx2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-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-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" ]
@@ -34892,18 +35814,24 @@ Index: chromium-150.0.7871.46/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-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 -      cflags = [
--        "-mavx2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-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-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" ]
@@ -34932,6 +35860,315 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  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-to-qu8-qc4uw-packw-x4c8-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-vbinary_avx512f") {
++    cflags = [
++      "-mavx512f"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vbinary/gen/f32-vadd-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmax-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmin-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vminc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmul-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx512f-u32.c",
++    "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-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-to-qu8-qc4uw-packw-x4c8-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",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    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("f32-vbinary_avx512f_standalone") {
++    cflags = [
++      "-mavx512f"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vbinary/gen/f32-vadd-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmax-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmin-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vminc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmul-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-avx512f-u32.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-avx512f-u32.c",
++    "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-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("f32-vbinary_sse-no-sse2") {
++    cflags = [
++      "-mno-sse2",
++    "-msse"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vbinary/gen/f32-vadd-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmax-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-sse-u8.c",
++    "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-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
@@ -34962,26 +36199,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+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"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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(
@@ -35021,13 +36253,6 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -35059,15 +36284,30 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_sse2-no-sse3_standalone") {
++  source_set("f32-vbinary_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-sse2.c"
++      "src/src/f32-vbinary/gen/f32-vadd-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmax-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-sse-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-sse-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -35188,14 +36428,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_x64") {
++  source_set("f32-vbinary_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-vbinary/gen/f32-vprelu-sse2-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-sse2-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-sse2-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -35246,14 +36489,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_x64_standalone") {
++  source_set("f32-vbinary_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-vbinary/gen/f32-vprelu-sse2-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-sse2-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-sse2-u8.c"
 +    ]
  
 -      sources = [
@@ -35395,14 +36641,32 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_avx512f") {
++  source_set("f32-vbinary_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-avx512f-u32.c"
++      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -35488,14 +36752,32 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_avx512f_standalone") {
++  source_set("f32-vbinary_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-avx512f-u32.c"
++      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -35618,16 +36900,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_f16c-fma-no-avx2") {
++  source_set("f32-vclamp_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-fma3-u16.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-avx.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -35754,16 +37037,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_f16c-fma-no-avx2_standalone") {
++  source_set("f32-vclamp_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-fma3-u16.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-avx.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -35908,15 +37192,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_sse-no-sse2") {
++  source_set("f32-vclamp_avx512f") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -36020,15 +37303,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_sse-no-sse2_standalone") {
++  source_set("f32-vclamp_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36085,14 +37367,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_x64") {
++  source_set("f32-vclamp_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36116,14 +37399,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_x64_standalone") {
++  source_set("f32-vclamp_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-sse2.c"
 +    ]
  
 -      sources = [
@@ -36167,19 +37451,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vclamp_x64") {
 +    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"
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      sources = [
@@ -36288,19 +37567,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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_x64_standalone") {
 +    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"
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -36415,16 +37689,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_avx512f") {
++  source_set("f32-vcmul_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-vcmul/gen/f32-vcmul-avx512f-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -36508,16 +37780,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_avx512f_standalone") {
++  source_set("f32-vcmul_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-vcmul/gen/f32-vcmul-avx512f-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -36652,17 +37922,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_sse2-no-sse3") {
++  source_set("f32-vcmul_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-vcmul/gen/f32-vcmul-fma3-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -36790,17 +38059,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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-vcmul_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-vcmul/gen/f32-vcmul-fma3-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -36928,16 +38196,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_x64") {
++  source_set("f32-vcmul_sse-no-sse2") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-vcmul/gen/f32-vcmul-sse-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -37020,16 +38287,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_x64_standalone") {
++  source_set("f32-vcmul_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-vcmul/gen/f32-vcmul-sse-u8.c"
 +    ]
  
 -      sources = [
@@ -37073,17 +38339,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-igemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vcmul_x64") {
 +    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-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -37192,17 +38455,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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") {
++  source_set("f32-vcmul_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"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -37295,14 +38555,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vcos_avx512f") {
++  source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -37326,14 +38591,19 @@ Index: chromium-150.0.7871.46/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_avx512f_standalone") {
++  source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.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"
 +    ]
  
 -      sources = [
@@ -37376,16 +38646,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qu8-packw_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vcos_f16c-fma-no-avx2") {
++  source_set("f32-vcopysign_avx512f") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.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 = [
@@ -37489,16 +38759,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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-vcopysign_avx512f_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.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) {
@@ -37613,7 +38883,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcos_sse2-no-sse3") {
++  source_set("f32-vcopysign_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -37621,8 +38891,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -37680,7 +38951,7 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
++  source_set("f32-vcopysign_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -37688,8 +38959,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-vcopysign/gen/f32-vcopysign-sse2.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c"
 +    ]
  
 -      sources = [
@@ -37732,14 +39004,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-rdsum_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vcos_x64") {
++  source_set("f32-vcopysign_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
 +    ]
  
 -      sources = [
@@ -37847,14 +39121,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcos_x64_standalone") {
++  source_set("f32-vcopysign_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -37966,7 +39242,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-velu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -37976,7 +39252,7 @@ Index: chromium-150.0.7871.46/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-vcos/gen/f32-vcos-avx-rational-5-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -38068,7 +39344,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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-vcos_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -38078,7 +39354,7 @@ Index: chromium-150.0.7871.46/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-vcos/gen/f32-vcos-avx-rational-5-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -38199,14 +39475,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-velu_avx512f") {
++  source_set("f32-vcos_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
++      "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38230,14 +39506,14 @@ Index: chromium-150.0.7871.46/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_avx512f_standalone") {
++  source_set("f32-vcos_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
++      "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -38280,16 +39556,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-rsum_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-velu_f16c-fma-avx2") {
++  source_set("f32-vcos_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
++      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -38395,16 +39671,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_f16c-fma-avx2_standalone") {
++  source_set("f32-vcos_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
++      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -38515,7 +39791,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-velu_sse2-no-sse3") {
++  source_set("f32-vcos_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -38523,7 +39799,8 @@ Index: chromium-150.0.7871.46/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-vcos/gen/f32-vcos-sse2-rational-5-4-div.c",
++    "src/src/f32-vcos/gen/f32-vcos-sse2fma-rational-5-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -38607,7 +39884,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_sse2-no-sse3_standalone") {
++  source_set("f32-vcos_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -38615,7 +39892,8 @@ Index: chromium-150.0.7871.46/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-vcos/gen/f32-vcos-sse2-rational-5-4-div.c",
++    "src/src/f32-vcos/gen/f32-vcos-sse2fma-rational-5-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -38729,14 +40007,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-velu_x64") {
++  source_set("f32-vcos_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38760,14 +40038,14 @@ Index: chromium-150.0.7871.46/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_x64_standalone") {
++  source_set("f32-vcos_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -38811,7 +40089,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vadd_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vexp_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-velu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -38821,7 +40099,7 @@ Index: chromium-150.0.7871.46/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-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-u32.c"
 +    ]
  
 -      sources = [
@@ -38928,7 +40206,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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-velu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -38938,7 +40216,7 @@ Index: chromium-150.0.7871.46/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-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -39049,14 +40327,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vexp_avx512f") {
++  source_set("f32-velu_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c"
++      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -39140,14 +40418,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vexp_avx512f_standalone") {
++  source_set("f32-velu_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-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -39261,16 +40539,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vexp_f16c-fma-no-avx2") {
++  source_set("f32-velu_f16c-fma-avx2") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
++      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39294,16 +40572,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      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-velu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
++      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
 +    ]
  
 -      sources = [
@@ -39347,7 +40625,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vaddc_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vexp_sse2-no-sse3") {
++  source_set("f32-velu_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -39355,8 +40633,7 @@ Index: chromium-150.0.7871.46/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-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
 +    ]
  
 -      sources = [
@@ -39463,7 +40740,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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-velu_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -39471,8 +40748,7 @@ Index: chromium-150.0.7871.46/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-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -39577,14 +40853,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vexp_x64") {
++  source_set("f32-velu_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -39662,14 +40938,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vexp_x64_standalone") {
++  source_set("f32-velu_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -39783,7 +41059,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vexp_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -39793,7 +41069,7 @@ Index: chromium-150.0.7871.46/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-vexp/gen/f32-vexp-avx-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39817,7 +41093,7 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vexp_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -39827,7 +41103,7 @@ Index: chromium-150.0.7871.46/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-vexp/gen/f32-vexp-avx-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -39870,14 +41146,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_avx512f") {
++  source_set("f32-vexp_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
++      "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -39983,14 +41259,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_avx512f_standalone") {
++  source_set("f32-vexp_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
++      "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -40095,7 +41371,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_f16c-fma-no-avx2") {
++  source_set("f32-vexp_f16c-fma-no-avx2") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -40104,7 +41380,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
++      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -40182,7 +41458,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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-vexp_f16c-fma-no-avx2_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -40191,7 +41467,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
++      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -40305,7 +41581,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_sse2-no-sse3") {
++  source_set("f32-vexp_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -40313,8 +41589,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -40338,7 +41614,7 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
++  source_set("f32-vexp_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -40346,8 +41622,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-vexp/gen/f32-vexp-sse2-rational-3-2-div.c",
++    "src/src/f32-vexp/gen/f32-vexp-sse2fma-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -40390,14 +41666,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vlrelu_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_x64") {
++  source_set("f32-vexp_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -40503,14 +41779,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# 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_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-scalar-rational-3-2-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -40613,7 +41889,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -40623,7 +41899,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -40681,7 +41957,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -40691,7 +41967,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -40734,14 +42010,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vmul_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_avx512f") {
++  source_set("f32-vgelu_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -40847,14 +42123,14 @@ Index: chromium-150.0.7871.46/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-vgelu_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -40957,7 +42233,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_f16c-fma-no-avx2") {
++  source_set("f32-vgelu_f16c-fma-no-avx2") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -40966,7 +42242,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-fma3.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -41024,7 +42300,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_f16c-fma-no-avx2_standalone") {
++  source_set("f32-vgelu_f16c-fma-no-avx2_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -41033,7 +42309,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-fma3.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -41076,7 +42352,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vmulc_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_sse2-no-sse3") {
++  source_set("f32-vgelu_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -41084,8 +42360,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-vgelu/gen/f32-vgelu-sse2-rational-12-10-div.c",
++    "src/src/f32-vgelu/gen/f32-vgelu-sse2fma-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -41153,7 +42429,7 @@ Index: chromium-150.0.7871.46/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-vgelu_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -41161,8 +42437,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -41219,14 +42495,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_x64") {
++  source_set("f32-vgelu_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41250,14 +42526,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_x64_standalone") {
++  source_set("f32-vgelu_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -41300,14 +42576,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vprelu_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vlog_avx512f") {
++  source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
 +    ]
  
 -      sources = [
@@ -41375,14 +42654,17 @@ Index: chromium-150.0.7871.46/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-vhswish_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41439,16 +42721,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vlog_f16c-fma-avx2") {
++  source_set("f32-vhswish_avx512f") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41472,16 +42752,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_f16c-fma-avx2_standalone") {
++  source_set("f32-vhswish_avx512f_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
 +    ]
  
 -      sources = [
@@ -41524,7 +42802,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vpreluc_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vlog_f16c-fma-no-avx2") {
++  source_set("f32-vhswish_f16c-fma-no-avx2") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -41533,7 +42811,7 @@ Index: chromium-150.0.7871.46/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-vhswish/gen/f32-vhswish-fma3.c"
 +    ]
  
 -      sources = [
@@ -41601,7 +42879,7 @@ Index: chromium-150.0.7871.46/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-vhswish_f16c-fma-no-avx2_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mfma",
@@ -41610,7 +42888,7 @@ Index: chromium-150.0.7871.46/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-vhswish/gen/f32-vhswish-fma3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41667,7 +42945,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vlog_sse2-no-sse3") {
++  source_set("f32-vhswish_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -41675,8 +42953,8 @@ Index: chromium-150.0.7871.46/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-vhswish/gen/f32-vhswish-sse2.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41700,7 +42978,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_sse2-no-sse3_standalone") {
++  source_set("f32-vhswish_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -41708,8 +42986,8 @@ Index: chromium-150.0.7871.46/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-vhswish/gen/f32-vhswish-sse2.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c"
 +    ]
  
 -      sources = [
@@ -41752,14 +43030,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vrpreluc_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vlog_x64") {
++  source_set("f32-vhswish_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
  
 -      sources = [
@@ -41867,14 +43145,14 @@ Index: chromium-150.0.7871.46/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-vhswish_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -41988,17 +43266,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vlog_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-avx-u16.c"
++      "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -42084,39 +43359,23 @@ Index: chromium-150.0.7871.46/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-vlog_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-avx-u16.c"
++      "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -42150,32 +43409,13 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vlrelu_avx512f") {
-+    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",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qu8-dwconv_sse4.1-no-sse4.2") {
@@ -42201,33 +43441,9 @@ Index: chromium-150.0.7871.46/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-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" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -42266,61 +43482,27 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_sse-no-sse2") {
++  source_set("f32-vlog_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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",
++      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qu8-dwconv_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_sse-no-sse2_standalone") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-sse-u8.c"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -42341,12 +43523,16 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
  
@@ -42354,16 +43540,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qu8-dwconv_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-vlrelu_sse4.1-no-sse4.2") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vlog_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-u8.c"
++      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
 +    ]
  
 -      sources = [
@@ -42392,21 +43580,11 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
@@ -42433,39 +43611,17 @@ Index: chromium-150.0.7871.46/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-vlrelu_sse4.1-no-sse4.2_standalone") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      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) {
@@ -42499,31 +43655,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-vlrelu_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -42551,39 +43685,27 @@ Index: chromium-150.0.7871.46/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-vlrelu_x64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-vlog_f16c-fma-no-avx2") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      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" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qu8-f32-vcvt_f16c-fma-avx2_standalone") {
@@ -42616,23 +43738,6 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_sse-no-sse2") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -42675,37 +43780,25 @@ Index: chromium-150.0.7871.46/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_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c"
++      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -42744,32 +43837,13 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qu8-f32-vcvt_sse2-no-sse3") {
@@ -42794,33 +43868,9 @@ Index: chromium-150.0.7871.46/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-vmulcaddc_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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" ]
++    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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -42858,38 +43908,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vlog_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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",
++      "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"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qu8-f32-vcvt_sse4.1-no-sse4.2") {
@@ -42914,44 +43945,20 @@ Index: chromium-150.0.7871.46/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-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" ]
-+
+ 
+-      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" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -42984,32 +43991,6 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        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",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -43019,17 +44000,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_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"
 +    ]
  
 -      sources = [
@@ -43072,18 +44052,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-f32-vcvt_x64_standalone") {
 -      cflags = []
 +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"
 +    ]
  
 -      sources = [
@@ -43187,41 +44163,19 @@ Index: chromium-150.0.7871.46/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-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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qu8-gemm_f16c-fma-avx2") {
@@ -43248,38 +44202,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+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"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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" ]
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -43313,34 +44249,6 @@ Index: chromium-150.0.7871.46/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-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)) {
@@ -43380,36 +44288,26 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_x64") {
++  source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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-avx-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" ]
-+
-+    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) {
@@ -43448,38 +44346,15 @@ Index: chromium-150.0.7871.46/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-vrnd_x64_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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
    }
 +}
  
@@ -43507,8 +44382,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -43518,12 +44394,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-avx-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" ]
@@ -43533,10 +44407,14 @@ Index: chromium-150.0.7871.46/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" ]
+     }
    }
 +}
  
@@ -43571,20 +44449,16 @@ Index: chromium-150.0.7871.46/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-vrsqrt_avx-no-avx2-no-f16c-no-fma_standalone") {
+-    }
++if (build_with_chromium) {
++  source_set("f32-vlrelu_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43596,14 +44470,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
    }
 +}
  
@@ -43631,20 +44501,51 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-vrsqrt_avx512f") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vlrelu_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"
++      "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" ]
  
 -      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" ]
@@ -43658,20 +44559,20 @@ Index: chromium-150.0.7871.46/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("f32-vrsqrt_avx512f_standalone") {
++  source_set("f32-vlrelu_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-sse-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43695,16 +44596,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_sse2-no-sse3") {
++  source_set("f32-vlrelu_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-vlrelu/gen/f32-vlrelu-sse41-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43725,16 +44625,15 @@ Index: chromium-150.0.7871.46/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-vlrelu_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-vlrelu/gen/f32-vlrelu-sse41-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43758,15 +44657,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_x64") {
++  source_set("f32-vlrelu_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-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43787,15 +44685,14 @@ Index: chromium-150.0.7871.46/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-vlrelu_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-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43819,17 +44716,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vmulcaddc_sse-no-sse2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43850,17 +44745,15 @@ Index: chromium-150.0.7871.46/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-vmulcaddc_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43884,14 +44777,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_avx512f") {
++  source_set("f32-vmulcaddc_x64") {
 +    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-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43912,14 +44805,14 @@ Index: chromium-150.0.7871.46/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-vmulcaddc_x64_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-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43943,16 +44836,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_f16c-fma-avx2") {
++  source_set("f32-vrnd_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-vsigmoid/gen/f32-vsigmoid-avx2-rr1-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" ]
@@ -43973,16 +44870,20 @@ Index: chromium-150.0.7871.46/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_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-vsigmoid/gen/f32-vsigmoid-avx2-rr1-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" ]
@@ -44006,7 +44907,72 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_sse2-no-sse3") {
++  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",
++    ]
++
++    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"
++    ]
++  
++    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" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f32-vrnd_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -44014,7 +44980,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -44035,7 +45004,7 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -44043,7 +45012,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -44067,7 +45039,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_sse4.1-no-sse4.2") {
++  source_set("f32-vrnd_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -44075,8 +45047,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -44097,7 +45071,7 @@ Index: chromium-150.0.7871.46/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_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -44105,8 +45079,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -44130,14 +45106,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_x64") {
++  source_set("f32-vrnd_x64") {
 +    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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44158,14 +45137,17 @@ Index: chromium-150.0.7871.46/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-vrnd_x64_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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44189,7 +45171,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -44199,7 +45181,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-avx-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44220,7 +45203,7 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -44230,7 +45213,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-avx-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44254,14 +45238,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_avx512f") {
++  source_set("f32-vrsqrt_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44282,14 +45267,15 @@ Index: chromium-150.0.7871.46/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_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44313,16 +45299,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_f16c-fma-no-avx2") {
++  source_set("f32-vrsqrt_sse2-no-sse3") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-sse2-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44343,16 +45329,16 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-sse2-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44376,16 +45362,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_sse2-no-sse3") {
++  source_set("f32-vrsqrt_x64") {
 +    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"
++      "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" ]
@@ -44406,16 +45391,15 @@ Index: chromium-150.0.7871.46/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-vrsqrt_x64_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"
++      "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" ]
@@ -44439,14 +45423,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_x64") {
++  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-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44467,14 +45454,17 @@ Index: chromium-150.0.7871.46/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_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-scalar-rational-5-4-div.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44498,18 +45488,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vsigmoid_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44530,18 +45516,14 @@ Index: chromium-150.0.7871.46/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_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44565,14 +45547,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_avx512f") {
++  source_set("f32-vsigmoid_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44593,14 +45577,16 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44624,7 +45610,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_sse2-no-sse3") {
++  source_set("f32-vsigmoid_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -44632,8 +45618,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-sse2-rr2-lut64-p2-div-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44654,7 +45639,7 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -44662,8 +45647,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-sse2-rr2-lut64-p2-div-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44687,14 +45671,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_x64") {
++  source_set("f32-vsigmoid_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-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" ]
@@ -44715,14 +45701,16 @@ Index: chromium-150.0.7871.46/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_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-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" ]
@@ -44746,17 +45734,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vsigmoid_x64") {
 +    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"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44777,17 +45762,14 @@ Index: chromium-150.0.7871.46/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-vsigmoid_x64_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"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44811,14 +45793,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_avx512f") {
++  source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44839,14 +45824,17 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44870,16 +45858,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_f16c-fma-no-avx2") {
++  source_set("f32-vsin_avx512f") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44900,16 +45886,14 @@ Index: chromium-150.0.7871.46/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_avx512f_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44933,16 +45917,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_sse2-no-sse3") {
++  source_set("f32-vsin_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-fma3-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44963,16 +45947,16 @@ Index: chromium-150.0.7871.46/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_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-fma3-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44996,14 +45980,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_x64") {
++  source_set("f32-vsin_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/f32-vsin/gen/f32-vsin-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" ]
@@ -45024,14 +46010,16 @@ Index: chromium-150.0.7871.46/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-vsin_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/f32-vsin/gen/f32-vsin-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" ]
@@ -45055,19 +46043,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vsin_x64") {
 +    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"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45088,19 +46071,14 @@ Index: chromium-150.0.7871.46/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-vsin_x64_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"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45124,16 +46102,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vunary_avx512f") {
++  source_set("f32-vsqrt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-rsqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45154,16 +46134,18 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-rsqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45187,17 +46169,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vunary_sse2-no-sse3") {
++  source_set("f32-vsqrt_avx512f") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rsqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45218,17 +46197,14 @@ Index: chromium-150.0.7871.46/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_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rsqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45252,16 +46228,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vunary_x64") {
++  source_set("f32-vsqrt_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45282,16 +46258,16 @@ Index: chromium-150.0.7871.46/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-vsqrt_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45315,36 +46291,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("operators_x64") {
++  source_set("f32-vsqrt_x64") {
 +    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-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45365,36 +46319,14 @@ Index: chromium-150.0.7871.46/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-vsqrt_x64_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-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45418,17 +46350,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2") {
++  source_set("f32-vtanh_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/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-avx-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45449,17 +46381,17 @@ Index: chromium-150.0.7871.46/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_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/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-avx-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45483,19 +46415,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vtanh_avx512f") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx512f"
 +    ]
 +  
 +    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-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45516,19 +46443,14 @@ Index: chromium-150.0.7871.46/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-vtanh_avx512f_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx512f"
 +    ]
 +  
 +    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-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45552,17 +46474,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-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-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-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45583,17 +46504,16 @@ Index: chromium-150.0.7871.46/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-vtanh_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45617,14 +46537,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_x64") {
++  source_set("f32-vtanh_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-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" ]
@@ -45645,14 +46567,16 @@ Index: chromium-150.0.7871.46/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-vtanh_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-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" ]
@@ -45676,19 +46600,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vtanh_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-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45709,19 +46628,14 @@ Index: chromium-150.0.7871.46/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-vtanh_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-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45745,17 +46659,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx2") {
++  source_set("f32-vunary_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/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/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" ]
@@ -45776,17 +46692,19 @@ Index: chromium-150.0.7871.46/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("f32-vunary_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/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/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" ]
@@ -45810,21 +46728,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-vunary_avx512f") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    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/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" ]
@@ -45845,21 +46758,16 @@ Index: chromium-150.0.7871.46/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("f32-vunary_avx512f_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    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/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" ]
@@ -45883,22 +46791,17 @@ Index: chromium-150.0.7871.46/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("f32-vunary_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -45919,22 +46822,17 @@ Index: chromium-150.0.7871.46/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("f32-vunary_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -45958,19 +46856,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-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-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/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" ]
@@ -45991,19 +46886,16 @@ Index: chromium-150.0.7871.46/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("f32-vunary_x64_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"
++      "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" ]
@@ -46027,17 +46919,36 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx2") {
++  source_set("operators_x64") {
 +    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"
++      "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" ]
@@ -46058,17 +46969,36 @@ Index: chromium-150.0.7871.46/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("operators_x64_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"
++      "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" ]
@@ -46092,21 +47022,17 @@ Index: chromium-150.0.7871.46/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-qb4w-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-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" ]
@@ -46127,21 +47053,17 @@ Index: chromium-150.0.7871.46/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-qb4w-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-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" ]
@@ -46165,22 +47087,19 @@ Index: chromium-150.0.7871.46/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_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -46201,22 +47120,19 @@ Index: chromium-150.0.7871.46/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_standalone") {
++  source_set("qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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"
++      "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" ]
@@ -46240,25 +47156,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("qd8-f16-qc2w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -46279,25 +47187,17 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -46321,7 +47221,66 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
++  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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-qc2w-gemm_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    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" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -46332,8 +47291,8 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46354,7 +47313,7 @@ Index: chromium-150.0.7871.46/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",
@@ -46365,8 +47324,8 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46390,7 +47349,7 @@ Index: chromium-150.0.7871.46/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",
@@ -46399,8 +47358,8 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46421,7 +47380,7 @@ Index: chromium-150.0.7871.46/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",
@@ -46430,8 +47389,8 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46455,7 +47414,7 @@ Index: chromium-150.0.7871.46/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",
@@ -46468,8 +47427,8 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46490,7 +47449,7 @@ Index: chromium-150.0.7871.46/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",
@@ -46503,8 +47462,8 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46528,7 +47487,7 @@ Index: chromium-150.0.7871.46/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",
@@ -46542,8 +47501,8 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46564,7 +47523,7 @@ Index: chromium-150.0.7871.46/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",
@@ -46578,8 +47537,8 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46603,16 +47562,10 @@ Index: chromium-150.0.7871.46/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"
@@ -46620,8 +47573,8 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46642,16 +47595,10 @@ Index: chromium-150.0.7871.46/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"
@@ -46659,8 +47606,8 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46684,18 +47631,17 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46716,18 +47662,17 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46751,17 +47696,21 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46782,17 +47731,21 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46816,7 +47769,7 @@ Index: chromium-150.0.7871.46/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",
@@ -46830,8 +47783,8 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46852,7 +47805,7 @@ Index: chromium-150.0.7871.46/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",
@@ -46866,8 +47819,8 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46891,9 +47844,11 @@ Index: chromium-150.0.7871.46/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",
@@ -46906,8 +47861,8 @@ Index: chromium-150.0.7871.46/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" ]
@@ -46928,9 +47883,11 @@ Index: chromium-150.0.7871.46/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",
@@ -46943,71 +47900,8 @@ Index: chromium-150.0.7871.46/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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/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-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" ]
-+  }
-+}
-+
-+# 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"
++      "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" ]
@@ -47031,16 +47925,19 @@ Index: chromium-150.0.7871.46/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_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -47061,16 +47958,19 @@ Index: chromium-150.0.7871.46/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_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -47094,15 +47994,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_x64") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-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-avx2.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-3x8c8-minmax-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47123,15 +48025,17 @@ Index: chromium-150.0.7871.46/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-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-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-avx2.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-3x8c8-minmax-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47155,19 +48059,21 @@ Index: chromium-150.0.7871.46/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") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-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-avx256skx.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-avx256skx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47188,19 +48094,21 @@ Index: chromium-150.0.7871.46/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_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-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-avx256skx.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-avx256skx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -47224,17 +48132,22 @@ Index: chromium-150.0.7871.46/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") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-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"
++      "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" ]
@@ -47255,17 +48168,22 @@ Index: chromium-150.0.7871.46/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_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-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"
++      "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" ]
@@ -47289,14 +48207,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_x64") {
++  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-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.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" ]
@@ -47317,14 +48246,25 @@ Index: chromium-150.0.7871.46/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-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-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.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" ]
@@ -47348,19 +48288,18 @@ Index: chromium-150.0.7871.46/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_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-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-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" ]
@@ -47381,19 +48320,18 @@ Index: chromium-150.0.7871.46/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_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-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-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" ]
@@ -47417,7 +48355,7 @@ Index: chromium-150.0.7871.46/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-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -47426,8 +48364,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -47448,7 +48386,7 @@ Index: chromium-150.0.7871.46/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-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -47457,85 +48395,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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" ]
-+    }
-+  }
-+}
-+
-+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",
-+    ]
-+
-+    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_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"
++      "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" ]
@@ -47559,7 +48420,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -47573,8 +48434,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -47595,7 +48456,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -47609,8 +48470,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -47634,7 +48495,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -47649,8 +48510,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -47671,7 +48532,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -47686,8 +48547,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -47711,25 +48572,16 @@ Index: chromium-150.0.7871.46/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-qb4w-gemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -47750,25 +48602,16 @@ Index: chromium-150.0.7871.46/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-qb4w-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -47792,16 +48635,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_sse2-no-sse3") {
++  source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -47822,16 +48665,16 @@ Index: chromium-150.0.7871.46/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-qb4w-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -47855,16 +48698,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1") {
++  source_set("qd8-f32-qb4w-gemm_x64") {
 +    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"
++      "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" ]
@@ -47885,16 +48727,15 @@ Index: chromium-150.0.7871.46/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-qb4w-gemm_x64_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"
++      "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" ]
@@ -47918,15 +48759,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_x64") {
++  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-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-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" ]
@@ -47947,15 +48792,19 @@ Index: chromium-150.0.7871.46/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_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-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-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" ]
@@ -47979,19 +48828,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -48012,19 +48859,17 @@ Index: chromium-150.0.7871.46/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-qc2w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -48048,17 +48893,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2") {
++  source_set("qd8-f32-qc2w-gemm_x64") {
 +    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"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48079,17 +48921,14 @@ Index: chromium-150.0.7871.46/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-qc2w-gemm_x64_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"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48113,23 +48952,19 @@ Index: chromium-150.0.7871.46/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_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -48150,23 +48985,19 @@ Index: chromium-150.0.7871.46/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_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/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-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" ]
@@ -48190,22 +49021,17 @@ Index: chromium-150.0.7871.46/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-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-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"
++      "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" ]
@@ -48226,22 +49052,17 @@ Index: chromium-150.0.7871.46/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-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-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"
++      "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" ]
@@ -48265,25 +49086,23 @@ Index: chromium-150.0.7871.46/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") {
 +    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-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-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" ]
@@ -48304,25 +49123,23 @@ Index: chromium-150.0.7871.46/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_standalone") {
 +    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-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-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" ]
@@ -48346,16 +49163,22 @@ Index: chromium-150.0.7871.46/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") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -48376,16 +49199,22 @@ Index: chromium-150.0.7871.46/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_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -48409,16 +49238,23 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-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-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-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" ]
@@ -48439,16 +49275,23 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-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-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-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" ]
@@ -48472,16 +49315,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_x64") {
++  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-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-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" ]
@@ -48502,16 +49354,25 @@ Index: chromium-150.0.7871.46/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_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-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-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" ]
@@ -48535,19 +49396,16 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -48568,19 +49426,16 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -48604,17 +49459,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2") {
++  source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-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" ]
@@ -48635,17 +49489,16 @@ Index: chromium-150.0.7871.46/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-qc4w-gemm_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-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" ]
@@ -48669,23 +49522,15 @@ Index: chromium-150.0.7871.46/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-qc4w-gemm_x64") {
 +    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"
++      "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" ]
@@ -48706,23 +49551,15 @@ Index: chromium-150.0.7871.46/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-qc4w-gemm_x64_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"
++      "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" ]
@@ -48746,22 +49583,19 @@ Index: chromium-150.0.7871.46/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_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -48782,22 +49616,19 @@ Index: chromium-150.0.7871.46/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_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -48821,25 +49652,17 @@ Index: chromium-150.0.7871.46/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-avx2") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-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-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" ]
@@ -48860,25 +49683,17 @@ Index: chromium-150.0.7871.46/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-avx2_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-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-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" ]
@@ -48902,16 +49717,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_sse2-no-sse3") {
++  source_set("qd8-f32-qc8w-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/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-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" ]
@@ -48932,16 +49754,23 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
++  source_set("qd8-f32-qc8w-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/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-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" ]
@@ -48965,16 +49794,22 @@ Index: chromium-150.0.7871.46/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") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -48995,16 +49830,22 @@ Index: chromium-150.0.7871.46/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_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -49028,16 +49869,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_x64") {
++  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-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-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" ]
@@ -49058,16 +49908,25 @@ Index: chromium-150.0.7871.46/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_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-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-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" ]
@@ -49091,18 +49950,16 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -49123,18 +49980,16 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -49158,17 +50013,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_f16c-fma-avx2") {
++  source_set("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -49189,17 +50043,16 @@ Index: chromium-150.0.7871.46/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_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -49223,21 +50076,16 @@ Index: chromium-150.0.7871.46/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-gemm_x64") {
 +    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"
++      "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" ]
@@ -49258,21 +50106,16 @@ Index: chromium-150.0.7871.46/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-gemm_x64_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"
++      "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" ]
@@ -49296,16 +50139,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_sse2-no-sse3") {
++  source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -49326,16 +50172,19 @@ Index: chromium-150.0.7871.46/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_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -49359,16 +50208,17 @@ Index: chromium-150.0.7871.46/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-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c"
++      "src/src/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" ]
@@ -49389,16 +50239,17 @@ Index: chromium-150.0.7871.46/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-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c"
++      "src/src/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" ]
@@ -49422,17 +50273,23 @@ Index: chromium-150.0.7871.46/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") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-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-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" ]
@@ -49453,17 +50310,23 @@ Index: chromium-150.0.7871.46/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_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-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-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" ]
@@ -49487,16 +50350,22 @@ Index: chromium-150.0.7871.46/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") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -49517,16 +50386,22 @@ Index: chromium-150.0.7871.46/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_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -49550,17 +50425,25 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -49581,17 +50464,25 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -49615,16 +50506,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_f16c-fma-avx2") {
++  source_set("qd8-f32-qc8w-igemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c"
++      "src/src/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" ]
@@ -49645,16 +50536,16 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c"
++      "src/src/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" ]
@@ -49678,20 +50569,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c"
++      "src/src/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" ]
@@ -49712,20 +50599,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c"
++      "src/src/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" ]
@@ -49749,15 +50632,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_sse2-no-sse3") {
++  source_set("qd8-f32-qc8w-igemm_x64") {
 +    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" ]
@@ -49778,15 +50662,16 @@ Index: chromium-150.0.7871.46/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" ]
@@ -49810,15 +50695,18 @@ Index: chromium-150.0.7871.46/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" ]
@@ -49839,15 +50727,18 @@ Index: chromium-150.0.7871.46/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" ]
@@ -49871,14 +50762,17 @@ Index: chromium-150.0.7871.46/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" ]
@@ -49899,14 +50793,17 @@ Index: chromium-150.0.7871.46/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" ]
@@ -49930,19 +50827,21 @@ Index: chromium-150.0.7871.46/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" ]
@@ -49963,19 +50862,21 @@ Index: chromium-150.0.7871.46/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" ]
@@ -49999,16 +50900,16 @@ Index: chromium-150.0.7871.46/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-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" ]
@@ -50029,16 +50930,16 @@ Index: chromium-150.0.7871.46/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-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" ]
@@ -50062,23 +50963,16 @@ Index: chromium-150.0.7871.46/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" ]
@@ -50099,23 +50993,16 @@ Index: chromium-150.0.7871.46/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" ]
@@ -50139,17 +51026,17 @@ Index: chromium-150.0.7871.46/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-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-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" ]
@@ -50170,17 +51057,17 @@ Index: chromium-150.0.7871.46/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-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-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" ]
@@ -50204,19 +51091,16 @@ Index: chromium-150.0.7871.46/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" ]
@@ -50237,19 +51121,16 @@ Index: chromium-150.0.7871.46/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" ]
@@ -50273,17 +51154,17 @@ Index: chromium-150.0.7871.46/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" ]
@@ -50304,17 +51185,17 @@ Index: chromium-150.0.7871.46/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" ]
@@ -50338,21 +51219,16 @@ Index: chromium-150.0.7871.46/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" ]
@@ -50373,21 +51249,16 @@ Index: chromium-150.0.7871.46/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" ]
@@ -50411,17 +51282,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_x64") {
++  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-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-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50442,17 +51316,20 @@ Index: chromium-150.0.7871.46/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_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-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-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50476,18 +51353,15 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50508,18 +51382,15 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50543,19 +51414,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-f32-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50576,19 +51443,15 @@ Index: chromium-150.0.7871.46/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_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-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-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50612,17 +51475,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx2") {
++  source_set("qs8-f32-vcvt_x64") {
 +    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"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50643,17 +51503,14 @@ Index: chromium-150.0.7871.46/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-f32-vcvt_x64_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"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50677,23 +51534,19 @@ Index: chromium-150.0.7871.46/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_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-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-x8c8-gemm-goi-avxvnni-prfm.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50714,23 +51567,19 @@ Index: chromium-150.0.7871.46/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_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-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-x8c8-gemm-goi-avxvnni-prfm.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50754,22 +51603,16 @@ Index: chromium-150.0.7871.46/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-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-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"
++      "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50790,22 +51633,16 @@ Index: chromium-150.0.7871.46/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-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-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"
++      "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50829,16 +51666,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_ssse3-no-sse4.1") {
++  source_set("qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -50859,16 +51703,23 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -50892,15 +51743,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_x64") {
++  source_set("qs8-packw_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50921,15 +51774,17 @@ Index: chromium-150.0.7871.46/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-packw_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -50953,19 +51808,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qc2w-gemm_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-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-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" ]
@@ -50986,19 +51841,19 @@ Index: chromium-150.0.7871.46/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-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -51022,7 +51877,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_f16c-fma-avx2") {
++  source_set("qs8-qc2w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -51031,9 +51886,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -51054,7 +51908,7 @@ Index: chromium-150.0.7871.46/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-qc2w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -51063,9 +51917,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -51089,7 +51942,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc2w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -51102,9 +51955,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -51125,7 +51977,7 @@ Index: chromium-150.0.7871.46/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-qc2w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -51138,9 +51990,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -51164,82 +52015,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_sse2-no-sse3_standalone") {
++  source_set("qs8-qc2w-gemm_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c"
++      "src/src/qs8-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" ]
@@ -51260,17 +52046,17 @@ Index: chromium-150.0.7871.46/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-qc2w-gemm_x64_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"
++      "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" ]
@@ -51294,19 +52080,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_x64") {
++  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-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-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" ]
@@ -51327,19 +52112,18 @@ Index: chromium-150.0.7871.46/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_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-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-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" ]
@@ -51363,18 +52147,19 @@ Index: chromium-150.0.7871.46/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_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-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-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" ]
@@ -51395,18 +52180,19 @@ Index: chromium-150.0.7871.46/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_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-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-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" ]
@@ -51430,19 +52216,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -51463,19 +52247,17 @@ Index: chromium-150.0.7871.46/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-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -51499,19 +52281,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnniint8",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-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-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" ]
@@ -51532,19 +52318,23 @@ Index: chromium-150.0.7871.46/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-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnniint8",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-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-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" ]
@@ -51568,17 +52358,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx2") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -51599,17 +52394,22 @@ Index: chromium-150.0.7871.46/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-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -51633,23 +52433,16 @@ Index: chromium-150.0.7871.46/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-gemm_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -51670,23 +52463,16 @@ Index: chromium-150.0.7871.46/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-gemm_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-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" ]
@@ -51710,22 +52496,15 @@ Index: chromium-150.0.7871.46/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-qc4w-gemm_x64") {
 +    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"
++      "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" ]
@@ -51746,22 +52525,15 @@ Index: chromium-150.0.7871.46/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-qc4w-gemm_x64_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"
++      "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" ]
@@ -51785,16 +52557,10 @@ Index: chromium-150.0.7871.46/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-qc4w-packw_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -51802,8 +52568,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -51824,16 +52590,10 @@ Index: chromium-150.0.7871.46/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-qc4w-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -51841,8 +52601,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -51866,16 +52626,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_sse2-no-sse3") {
++  source_set("qs8-qc4w-packw_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-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-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" ]
@@ -51896,16 +52663,23 @@ Index: chromium-150.0.7871.46/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-qc4w-packw_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-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-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" ]
@@ -51929,16 +52703,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2") {
++  source_set("qs8-qc4w-packw_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-qc4w-packw/gen/qs8-qc4uw-packw-x4c8-gemm-goi-sse2.c",
++    "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x4c8-gemm-goi-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51959,16 +52733,16 @@ Index: chromium-150.0.7871.46/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-qc4w-packw_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-qc4w-packw/gen/qs8-qc4uw-packw-x4c8-gemm-goi-sse2.c",
++    "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x4c8-gemm-goi-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51992,15 +52766,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_x64") {
++  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-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-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" ]
@@ -52021,15 +52799,19 @@ Index: chromium-150.0.7871.46/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_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-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-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" ]
@@ -52053,18 +52835,18 @@ Index: chromium-150.0.7871.46/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-dwconv_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -52085,18 +52867,18 @@ Index: chromium-150.0.7871.46/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-dwconv_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-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-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" ]
@@ -52120,19 +52902,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-qc8w-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-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-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" ]
@@ -52153,19 +52938,22 @@ Index: chromium-150.0.7871.46/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-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-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-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" ]
@@ -52189,19 +52977,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni") {
++  source_set("qs8-qc8w-dwconv_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnniint8",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -52222,19 +53008,17 @@ Index: chromium-150.0.7871.46/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-dwconv_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnniint8",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -52258,17 +53042,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx2") {
++  source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -52289,17 +53073,17 @@ Index: chromium-150.0.7871.46/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-dwconv_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -52323,23 +53107,19 @@ Index: chromium-150.0.7871.46/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-dwconv_x64") {
 +    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"
++      "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" ]
@@ -52360,23 +53140,19 @@ Index: chromium-150.0.7871.46/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-dwconv_x64_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"
++      "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" ]
@@ -52400,22 +53176,18 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -52436,22 +53208,18 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-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" ]
@@ -52475,16 +53243,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
++  source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -52492,8 +53254,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -52514,16 +53276,10 @@ Index: chromium-150.0.7871.46/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-gfni-amx-tile-amx-int8_standalone") {
++  source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -52531,8 +53287,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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"
++      "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" ]
@@ -52556,16 +53312,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_sse2-no-sse3") {
++  source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mavxvnniint8",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -52586,16 +53345,19 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
++  source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mavxvnniint8",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -52619,16 +53381,17 @@ Index: chromium-150.0.7871.46/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-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -52649,16 +53412,17 @@ Index: chromium-150.0.7871.46/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-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -52682,15 +53446,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_x64") {
++  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-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-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" ]
@@ -52711,15 +53483,23 @@ Index: chromium-150.0.7871.46/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_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-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-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" ]
@@ -52743,18 +53523,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-qc8w-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/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.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" ]
@@ -52775,18 +53559,22 @@ Index: chromium-150.0.7871.46/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_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-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.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" ]
@@ -52810,21 +53598,25 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mavx512bw",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
 +    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -52845,21 +53637,25 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mavx512bw",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
 +    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -52883,14 +53679,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_x64") {
++  source_set("qs8-qc8w-gemm_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.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" ]
@@ -52911,14 +53709,16 @@ Index: chromium-150.0.7871.46/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-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.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" ]
@@ -52942,16 +53742,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_f16c-fma-avx2") {
++  source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.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" ]
@@ -52972,16 +53772,16 @@ Index: chromium-150.0.7871.46/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-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.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" ]
@@ -53005,20 +53805,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc8w-gemm_x64") {
 +    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"
++      "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" ]
@@ -53039,20 +53834,15 @@ Index: chromium-150.0.7871.46/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-gemm_x64_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"
++      "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" ]
@@ -53076,15 +53866,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_sse4.1-no-sse4.2") {
++  source_set("qs8-qc8w-igemm_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-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.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" ]
@@ -53105,15 +53898,18 @@ Index: chromium-150.0.7871.46/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_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-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.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" ]
@@ -53137,14 +53933,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_x64") {
++  source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -53165,14 +53966,19 @@ Index: chromium-150.0.7871.46/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_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -53196,10 +54002,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
++    "-mavxvnniint8",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -53207,7 +54013,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -53228,10 +54035,10 @@ Index: chromium-150.0.7871.46/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_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
++    "-mavxvnniint8",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -53239,7 +54046,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -53263,7 +54071,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_f16c-fma-avx2") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -53272,7 +54080,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -53293,7 +54102,7 @@ Index: chromium-150.0.7871.46/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-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -53302,7 +54111,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -53326,7 +54136,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -53339,8 +54149,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -53361,7 +54173,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -53374,8 +54186,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -53399,7 +54213,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -53413,7 +54227,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -53434,7 +54249,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -53448,7 +54263,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -53472,15 +54288,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_ssse3-no-sse4.1") {
++  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -53501,15 +54327,25 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -53533,14 +54369,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_x64") {
++  source_set("qs8-qc8w-igemm_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.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" ]
@@ -53561,14 +54399,16 @@ Index: chromium-150.0.7871.46/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-qc8w-igemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.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" ]
@@ -53592,17 +54432,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qc8w-igemm_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-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.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" ]
@@ -53623,17 +54462,16 @@ Index: chromium-150.0.7871.46/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-qc8w-igemm_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-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.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" ]
@@ -53657,16 +54495,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_f16c-fma-avx2") {
++  source_set("qs8-qc8w-igemm_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-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" ]
@@ -53687,16 +54524,15 @@ Index: chromium-150.0.7871.46/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-qc8w-igemm_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-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" ]
@@ -53720,20 +54556,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qu8-packw_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-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53754,20 +54588,18 @@ Index: chromium-150.0.7871.46/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-qu8-packw_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-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53791,15 +54623,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_sse2-no-sse3") {
++  source_set("qs8-qu8-packw_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-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53820,15 +54658,21 @@ Index: chromium-150.0.7871.46/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-qu8-packw_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-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53852,15 +54696,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_sse4.1-no-sse4.2") {
++  source_set("qs8-qu8-packw_x64") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53881,15 +54724,14 @@ Index: chromium-150.0.7871.46/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-qu8-packw_x64_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"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53913,15 +54755,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_x64") {
++  source_set("qs8-rdsum_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-7p7x-minmax-fp32-avx2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53942,15 +54785,16 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-7p7x-minmax-fp32-avx2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53974,17 +54818,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54005,17 +54852,20 @@ Index: chromium-150.0.7871.46/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-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54039,16 +54889,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_f16c-fma-avx2") {
++  source_set("qs8-rdsum_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54069,16 +54918,15 @@ Index: chromium-150.0.7871.46/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-rdsum_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54102,20 +54950,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-rdsum_x64") {
 +    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"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54136,20 +54978,14 @@ Index: chromium-150.0.7871.46/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-rdsum_x64_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"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54173,15 +55009,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_sse2-no-sse3") {
++  source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-avxvnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54202,15 +55041,18 @@ Index: chromium-150.0.7871.46/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_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-avxvnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54234,15 +55076,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_sse4.1-no-sse4.2") {
++  source_set("qs8-rsum_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54263,15 +55106,16 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54295,15 +55139,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_x64") {
++  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-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-avx256skx-u64-acc2.c",
++    "src/src/qs8-rsum/gen/qs8-rsum-avx512skx-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54324,15 +55174,21 @@ Index: chromium-150.0.7871.46/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_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-scalar-u1.c",
-+    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.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" ]
@@ -54356,17 +55212,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-rsum_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-vcvt/gen/qs8-vcvt-avx-u32.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54387,17 +55247,21 @@ Index: chromium-150.0.7871.46/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-rsum_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-vcvt/gen/qs8-vcvt-avx-u32.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54421,16 +55285,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_f16c-fma-avx2") {
++  source_set("qs8-rsum_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54451,16 +55314,15 @@ Index: chromium-150.0.7871.46/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-rsum_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54484,15 +55346,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_sse2-no-sse3") {
++  source_set("qs8-rsum_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54513,15 +55374,14 @@ Index: chromium-150.0.7871.46/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-rsum_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54545,15 +55405,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_sse4.1-no-sse4.2") {
++  source_set("qs8-vadd_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-vcvt/gen/qs8-vcvt-sse41-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54574,15 +55436,17 @@ Index: chromium-150.0.7871.46/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_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-vcvt/gen/qs8-vcvt-sse41-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54606,15 +55470,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_ssse3-no-sse4.1") {
++  source_set("qs8-vadd_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54635,15 +55500,16 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54667,14 +55533,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_x64") {
++  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-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54695,14 +55567,81 @@ Index: chromium-150.0.7871.46/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_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("qs8-vadd_sse2-no-sse3") {
++    cflags = [
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "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" ]
++  }
++}
++
++# 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" ]
@@ -54726,17 +55665,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vadd_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-vlrelu/gen/qs8-vlrelu-avx-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54757,17 +55694,15 @@ Index: chromium-150.0.7871.46/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-vadd_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-vlrelu/gen/qs8-vlrelu-avx-u32.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54791,78 +55726,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_f16c-fma-avx2") {
++  source_set("qs8-vadd_x64") {
 +    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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_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" ]
-+    }
-+  }
-+}
-+
-+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"
++      "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" ]
@@ -54883,15 +55755,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_sse2-no-sse3_standalone") {
++  source_set("qs8-vadd_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-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" ]
@@ -54915,15 +55787,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_sse4.1-no-sse4.2") {
++  source_set("qs8-vaddc_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-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54944,15 +55818,17 @@ Index: chromium-150.0.7871.46/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_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-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54976,15 +55852,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_ssse3-no-sse4.1") {
++  source_set("qs8-vaddc_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55005,15 +55882,16 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55037,14 +55915,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_x64") {
++  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-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55065,14 +55949,20 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55096,17 +55986,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vaddc_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55127,17 +56015,15 @@ Index: chromium-150.0.7871.46/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-vaddc_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55161,15 +56047,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_sse2-no-sse3") {
++  source_set("qs8-vaddc_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55190,15 +56076,15 @@ Index: chromium-150.0.7871.46/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-vaddc_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55222,15 +56108,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_sse4.1-no-sse4.2") {
++  source_set("qs8-vaddc_x64") {
 +    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"
++      "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" ]
@@ -55251,15 +56137,15 @@ Index: chromium-150.0.7871.46/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-vaddc_x64_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"
++      "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" ]
@@ -55283,14 +56169,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_x64") {
++  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-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55311,14 +56200,17 @@ Index: chromium-150.0.7871.46/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_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-scalar-u4.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55342,17 +56234,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55373,17 +56264,16 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55407,7 +56297,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_sse2-no-sse3") {
++  source_set("qs8-vcvt_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -55415,7 +56305,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55436,7 +56326,7 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -55444,7 +56334,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55468,7 +56358,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_sse4.1-no-sse4.2") {
++  source_set("qs8-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -55476,7 +56366,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55497,7 +56387,7 @@ Index: chromium-150.0.7871.46/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-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -55505,7 +56395,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55529,14 +56419,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_x64") {
++  source_set("qs8-vcvt_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55557,14 +56448,15 @@ Index: chromium-150.0.7871.46/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-vcvt_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55588,16 +56480,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_f16c-fma-avx2") {
++  source_set("qs8-vcvt_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55618,16 +56508,14 @@ Index: chromium-150.0.7871.46/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-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55651,14 +56539,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_x64") {
++  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-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55679,14 +56570,17 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55710,7 +56604,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_f16c-fma-avx2") {
++  source_set("qs8-vlrelu_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -55719,7 +56613,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55740,7 +56634,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -55749,7 +56643,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55773,14 +56667,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_x64") {
++  source_set("qs8-vlrelu_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55801,14 +56696,15 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55832,16 +56728,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_f16c-fma-avx2") {
++  source_set("qs8-vlrelu_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55862,16 +56757,15 @@ Index: chromium-150.0.7871.46/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-vlrelu_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55895,14 +56789,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_x64") {
++  source_set("qs8-vlrelu_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55923,14 +56818,15 @@ Index: chromium-150.0.7871.46/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-vlrelu_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55954,84 +56850,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +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",
-+    ]
-+
-+    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") {
++  source_set("qs8-vlrelu_x64") {
 +    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" ]
-+    }
-+  }
-+}
-+
-+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"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56052,17 +56878,14 @@ Index: chromium-150.0.7871.46/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-vlrelu_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-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56086,21 +56909,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-vmul_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-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56121,21 +56940,17 @@ Index: chromium-150.0.7871.46/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-vmul_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-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56159,7 +56974,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_sse2-no-sse3") {
++  source_set("qs8-vmul_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -56167,8 +56982,7 @@ Index: chromium-150.0.7871.46/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-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56189,7 +57003,7 @@ Index: chromium-150.0.7871.46/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-vmul_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -56197,8 +57011,7 @@ Index: chromium-150.0.7871.46/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-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56222,7 +57035,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_sse4.1-no-sse4.2") {
++  source_set("qs8-vmul_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -56230,8 +57043,7 @@ Index: chromium-150.0.7871.46/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-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56252,7 +57064,7 @@ Index: chromium-150.0.7871.46/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-vmul_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -56260,8 +57072,7 @@ Index: chromium-150.0.7871.46/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-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56285,17 +57096,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_x64") {
++  source_set("qs8-vmul_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-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56316,17 +57124,14 @@ Index: chromium-150.0.7871.46/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-vmul_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-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56350,7 +57155,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -56360,7 +57165,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56381,7 +57186,7 @@ Index: chromium-150.0.7871.46/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-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -56391,7 +57196,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56415,16 +57220,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_f16c-fma-avx2") {
++  source_set("qs8-vmulc_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56445,16 +57249,15 @@ Index: chromium-150.0.7871.46/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-vmulc_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56478,20 +57281,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-vmulc_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56512,20 +57310,15 @@ Index: chromium-150.0.7871.46/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-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-vmulc_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56549,15 +57342,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_sse2-no-sse3") {
++  source_set("qs8-vmulc_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56578,15 +57370,14 @@ Index: chromium-150.0.7871.46/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-vmulc_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-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56610,15 +57401,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_sse4.1-no-sse4.2") {
++  source_set("qs8-vprelu_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-vprelu/gen/qs8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56639,15 +57431,16 @@ Index: chromium-150.0.7871.46/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-vprelu_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-vprelu/gen/qs8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56671,14 +57464,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_x64") {
++  source_set("qs8-vprelu_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56699,81 +57492,14 @@ Index: chromium-150.0.7871.46/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") {
-+    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("qu8-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vprelu_x64_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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# 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"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56797,7 +57523,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_f16c-fma-avx2") {
++  source_set("qs8-vpreluc_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -56806,8 +57532,7 @@ Index: chromium-150.0.7871.46/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/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56828,7 +57553,7 @@ Index: chromium-150.0.7871.46/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("qs8-vpreluc_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -56837,8 +57562,7 @@ Index: chromium-150.0.7871.46/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/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56862,21 +57586,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-vpreluc_x64") {
 +    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"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56897,21 +57614,14 @@ Index: chromium-150.0.7871.46/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("qs8-vpreluc_x64_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"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56935,16 +57645,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_sse2-no-sse3") {
++  source_set("qs8-vrpreluc_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56965,16 +57675,16 @@ Index: chromium-150.0.7871.46/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("qs8-vrpreluc_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56998,16 +57708,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_sse4.1-no-sse4.2") {
++  source_set("qs8-vrpreluc_x64") {
 +    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"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57028,16 +57736,14 @@ Index: chromium-150.0.7871.46/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("qs8-vrpreluc_x64_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"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57061,15 +57767,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_x64") {
++  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-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-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" ]
@@ -57090,15 +57799,18 @@ Index: chromium-150.0.7871.46/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_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-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-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" ]
@@ -57122,18 +57834,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-dwconv_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -57154,18 +57865,17 @@ Index: chromium-150.0.7871.46/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-dwconv_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-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" ]
@@ -57189,17 +57899,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_f16c-fma-avx2") {
++  source_set("qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-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"
++      "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" ]
@@ -57220,17 +57934,21 @@ Index: chromium-150.0.7871.46/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-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -57254,21 +57972,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qu8-dwconv_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -57289,21 +58002,16 @@ Index: chromium-150.0.7871.46/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-dwconv_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -57327,16 +58035,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_sse2-no-sse3") {
++  source_set("qu8-dwconv_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -57357,16 +58065,16 @@ Index: chromium-150.0.7871.46/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-dwconv_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -57390,16 +58098,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_sse4.1-no-sse4.2") {
++  source_set("qu8-dwconv_x64") {
 +    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"
++      "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" ]
@@ -57420,16 +58129,17 @@ Index: chromium-150.0.7871.46/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-dwconv_x64_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"
++      "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" ]
@@ -57453,15 +58163,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_x64") {
++  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-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-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57482,15 +58194,17 @@ Index: chromium-150.0.7871.46/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_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-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-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57514,15 +58228,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_ssse3-no-sse4.1") {
++  source_set("qu8-f32-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57543,15 +58258,16 @@ Index: chromium-150.0.7871.46/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-f32-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57575,14 +58291,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_x64") {
++  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-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57603,14 +58325,81 @@ Index: chromium-150.0.7871.46/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-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" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qu8-f32-vcvt_sse2-no-sse3") {
++    cflags = [
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "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" ]
++  }
++}
++
++# 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" ]
@@ -57634,16 +58423,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_f16c-fma-avx2") {
++  source_set("qu8-f32-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57664,16 +58452,15 @@ Index: chromium-150.0.7871.46/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-f32-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57697,15 +58484,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_sse2-no-sse3") {
++  source_set("qu8-f32-vcvt_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57726,15 +58512,14 @@ Index: chromium-150.0.7871.46/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-f32-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57758,66 +58543,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-rsum_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -57827,7 +58553,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -57848,7 +58575,7 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -57858,7 +58585,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -57882,7 +58610,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_f16c-fma-avx2") {
++  source_set("qu8-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -57891,7 +58619,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.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" ]
@@ -57912,7 +58641,7 @@ Index: chromium-150.0.7871.46/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-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -57921,7 +58650,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.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" ]
@@ -57945,7 +58675,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -57958,7 +58688,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -57979,7 +58710,7 @@ Index: chromium-150.0.7871.46/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-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -57992,7 +58723,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -58016,7 +58748,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_sse2-no-sse3") {
++  source_set("qu8-gemm_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -58024,7 +58756,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.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" ]
@@ -58045,7 +58778,7 @@ Index: chromium-150.0.7871.46/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-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -58053,7 +58786,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.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" ]
@@ -58077,7 +58811,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_sse4.1-no-sse4.2") {
++  source_set("qu8-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -58085,7 +58819,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.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" ]
@@ -58106,7 +58841,7 @@ Index: chromium-150.0.7871.46/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-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -58114,7 +58849,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.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" ]
@@ -58138,15 +58874,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_x64") {
++  source_set("qu8-gemm_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-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" ]
@@ -58167,15 +58903,15 @@ Index: chromium-150.0.7871.46/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-gemm_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-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" ]
@@ -58199,7 +58935,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -58209,7 +58945,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -58230,7 +58967,7 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -58240,7 +58977,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -58264,7 +59002,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_f16c-fma-avx2") {
++  source_set("qu8-igemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -58273,7 +59011,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-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" ]
@@ -58294,7 +59033,7 @@ Index: chromium-150.0.7871.46/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-igemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -58303,7 +59042,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-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" ]
@@ -58327,7 +59067,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -58340,7 +59080,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -58361,7 +59102,7 @@ Index: chromium-150.0.7871.46/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-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -58374,7 +59115,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -58398,7 +59140,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_sse2-no-sse3") {
++  source_set("qu8-igemm_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -58406,7 +59148,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-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" ]
@@ -58427,7 +59170,7 @@ Index: chromium-150.0.7871.46/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-igemm_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -58435,7 +59178,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-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" ]
@@ -58459,7 +59203,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_sse4.1-no-sse4.2") {
++  source_set("qu8-igemm_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -58467,7 +59211,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.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" ]
@@ -58488,7 +59233,7 @@ Index: chromium-150.0.7871.46/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-igemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -58496,7 +59241,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.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" ]
@@ -58520,15 +59266,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_x64") {
++  source_set("qu8-igemm_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-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" ]
@@ -58549,15 +59295,15 @@ Index: chromium-150.0.7871.46/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-igemm_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-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" ]
@@ -58581,17 +59327,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-rdsum_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58612,17 +59356,15 @@ Index: chromium-150.0.7871.46/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-rdsum_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58646,16 +59388,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_f16c-fma-avx2") {
++  source_set("qu8-rdsum_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58676,16 +59416,14 @@ Index: chromium-150.0.7871.46/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-rdsum_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58709,15 +59447,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_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-vcvt/gen/qu8-vcvt-sse2-u32.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58738,15 +59477,16 @@ Index: chromium-150.0.7871.46/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-rsum_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58770,15 +59510,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_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-vcvt/gen/qu8-vcvt-sse41-u32.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58799,15 +59539,15 @@ Index: chromium-150.0.7871.46/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-rsum_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-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58831,15 +59571,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_ssse3-no-sse4.1") {
++  source_set("qu8-rsum_x64") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58860,15 +59599,14 @@ Index: chromium-150.0.7871.46/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-rsum_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58892,14 +59630,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_x64") {
++  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-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58920,14 +59661,17 @@ Index: chromium-150.0.7871.46/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_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-scalar-u4.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58951,17 +59695,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-vadd_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58982,17 +59725,16 @@ Index: chromium-150.0.7871.46/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-vadd_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59016,16 +59758,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_f16c-fma-avx2") {
++  source_set("qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59046,16 +59792,20 @@ Index: chromium-150.0.7871.46/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-vadd_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-vlrelu/gen/qu8-vlrelu-avx2-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59079,7 +59829,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_sse2-no-sse3") {
++  source_set("qu8-vadd_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -59087,7 +59837,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59108,7 +59858,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_sse2-no-sse3_standalone") {
++  source_set("qu8-vadd_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -59116,7 +59866,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59140,7 +59890,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_sse4.1-no-sse4.2") {
++  source_set("qu8-vadd_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -59148,7 +59898,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59169,7 +59919,7 @@ Index: chromium-150.0.7871.46/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-vadd_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -59177,7 +59927,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59201,15 +59951,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_ssse3-no-sse4.1") {
++  source_set("qu8-vadd_x64") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.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" ]
@@ -59230,15 +59980,15 @@ Index: chromium-150.0.7871.46/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-vadd_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.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" ]
@@ -59262,14 +60012,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_x64") {
++  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-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59290,14 +60043,17 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59321,17 +60077,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-vaddc_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59352,17 +60107,16 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59386,15 +60140,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_sse2-no-sse3") {
++  source_set("qu8-vaddc_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-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59415,15 +60174,20 @@ Index: chromium-150.0.7871.46/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-vaddc_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-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59447,15 +60211,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_sse4.1-no-sse4.2") {
++  source_set("qu8-vaddc_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59476,15 +60240,15 @@ Index: chromium-150.0.7871.46/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-vaddc_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59508,14 +60272,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_x64") {
++  source_set("qu8-vaddc_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59536,14 +60301,15 @@ Index: chromium-150.0.7871.46/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-vaddc_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59567,17 +60333,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_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-vmulc/gen/qu8-vmulc-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" ]
@@ -59598,17 +60362,15 @@ Index: chromium-150.0.7871.46/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-vaddc_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-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" ]
@@ -59632,15 +60394,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_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-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59661,15 +60425,17 @@ Index: chromium-150.0.7871.46/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_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-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59693,15 +60459,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_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-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59722,15 +60489,16 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59754,14 +60522,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_x64") {
++  source_set("qu8-vcvt_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59782,14 +60551,15 @@ Index: chromium-150.0.7871.46/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-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59813,16 +60583,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_f16c-fma-avx2") {
++  source_set("qu8-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59843,16 +60612,15 @@ Index: chromium-150.0.7871.46/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-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59876,14 +60644,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_x64") {
++  source_set("qu8-vcvt_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59904,14 +60673,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_x64_standalone") {
++  source_set("qu8-vcvt_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59935,16 +60705,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_f16c-fma-avx2") {
++  source_set("qu8-vcvt_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59965,16 +60733,14 @@ Index: chromium-150.0.7871.46/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-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59998,14 +60764,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_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-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60026,14 +60795,17 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60057,7 +60829,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_f16c-fma-avx2") {
++  source_set("qu8-vlrelu_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -60066,7 +60838,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60087,7 +60859,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -60096,7 +60868,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60120,14 +60892,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_x64") {
++  source_set("qu8-vlrelu_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60148,14 +60921,15 @@ Index: chromium-150.0.7871.46/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_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60179,16 +60953,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("reference_x64") {
++  source_set("qu8-vlrelu_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60209,16 +60982,15 @@ Index: chromium-150.0.7871.46/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-vlrelu_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60242,15 +61014,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_sse2-no-sse3") {
++  source_set("qu8-vlrelu_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60271,15 +61043,15 @@ Index: chromium-150.0.7871.46/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-vlrelu_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60303,15 +61075,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_sse4.1-no-sse4.2") {
++  source_set("qu8-vlrelu_x64") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60332,15 +61103,14 @@ Index: chromium-150.0.7871.46/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-vlrelu_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60364,14 +61134,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_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/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60392,14 +61165,17 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60423,15 +61199,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_sse4.1-no-sse4.2") {
++  source_set("qu8-vmul_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60452,15 +61228,15 @@ Index: chromium-150.0.7871.46/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-vmul_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60484,14 +61260,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_x64") {
++  source_set("qu8-vmul_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60512,14 +61289,15 @@ Index: chromium-150.0.7871.46/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-vmul_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60543,16 +61321,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_sse4.1-no-sse4.2") {
++  source_set("qu8-vmul_x64") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    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-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60573,16 +61349,14 @@ Index: chromium-150.0.7871.46/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-vmul_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    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-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60606,15 +61380,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_x64") {
++  source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60635,15 +61411,17 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60667,17 +61445,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_sse4.1-no-sse4.2") {
++  source_set("qu8-vmulc_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60698,17 +61474,15 @@ Index: chromium-150.0.7871.46/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-vmulc_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60732,16 +61506,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_x64") {
++  source_set("qu8-vmulc_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60762,16 +61535,15 @@ Index: chromium-150.0.7871.46/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-vmulc_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60795,16 +61567,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_f16c-fma-avx2") {
++  source_set("qu8-vmulc_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60825,16 +61595,14 @@ Index: chromium-150.0.7871.46/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-vmulc_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60858,20 +61626,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qu8-vprelu_f16c-fma-avx2") {
 +    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-vprelu/gen/qu8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60892,20 +61656,16 @@ Index: chromium-150.0.7871.46/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-vprelu_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-vprelu/gen/qu8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60929,15 +61689,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_sse2-no-sse3") {
++  source_set("qu8-vprelu_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse2-u64.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60958,15 +61717,14 @@ Index: chromium-150.0.7871.46/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-vprelu_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse2-u64.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60990,15 +61748,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_sse4.1-no-sse4.2") {
++  source_set("qu8-vpreluc_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61019,15 +61778,16 @@ Index: chromium-150.0.7871.46/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("qu8-vpreluc_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61051,14 +61811,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_x64") {
++  source_set("qu8-vpreluc_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61079,14 +61839,14 @@ Index: chromium-150.0.7871.46/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("qu8-vpreluc_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61110,43 +61870,77 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("subgraph_x64") {
++  source_set("qu8-vrpreluc_f16c-fma-avx2") {
 +    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vrpreluc/gen/qu8-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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-vrpreluc_f16c-fma-avx2_standalone") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/fp16_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-vrpreluc/gen/qu8-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" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qu8-vrpreluc_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61167,43 +61961,14 @@ Index: chromium-150.0.7871.46/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("qu8-vrpreluc_x64_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/fp16_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-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61227,22 +61992,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("tables_x64") {
++  source_set("reference_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/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61263,22 +62022,16 @@ Index: chromium-150.0.7871.46/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") {
++  source_set("reference_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"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61302,7 +62055,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_sse2-no-sse3") {
++  source_set("s8-ibilinear_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -61310,7 +62063,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61331,7 +62084,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_sse2-no-sse3_standalone") {
++  source_set("s8-ibilinear_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -61339,7 +62092,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61363,7 +62116,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_sse4.1-no-sse4.2") {
++  source_set("s8-ibilinear_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -61371,7 +62124,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61392,7 +62145,7 @@ Index: chromium-150.0.7871.46/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-ibilinear_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -61400,7 +62153,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61424,14 +62177,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_x64") {
++  source_set("s8-ibilinear_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61452,14 +62205,14 @@ Index: chromium-150.0.7871.46/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-ibilinear_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61483,74 +62236,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-lut32norm_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    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-lut32norm_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/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_sse2-no-sse3") {
++  source_set("s8-maxpool_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61571,15 +62265,15 @@ Index: chromium-150.0.7871.46/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-maxpool_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61603,14 +62297,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_x64") {
++  source_set("s8-maxpool_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61631,14 +62325,14 @@ Index: chromium-150.0.7871.46/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-maxpool_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61662,16 +62356,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_sse2-no-sse3") {
++  source_set("s8-rdminmax_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -61692,16 +62386,16 @@ Index: chromium-150.0.7871.46/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-rdminmax_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -61725,15 +62419,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_x64") {
++  source_set("s8-rdminmax_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/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" ]
@@ -61754,15 +62448,15 @@ Index: chromium-150.0.7871.46/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-rdminmax_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/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" ]
@@ -61786,17 +62480,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_sse2-no-sse3") {
++  source_set("s8-rminmax_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -61817,17 +62511,17 @@ Index: chromium-150.0.7871.46/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-rminmax_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -61851,16 +62545,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_x64") {
++  source_set("s8-rminmax_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/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" ]
@@ -61881,16 +62575,16 @@ Index: chromium-150.0.7871.46/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-rminmax_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/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" ]
@@ -61914,7 +62608,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_f16c-fma-avx2") {
++  source_set("s8-vclamp_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -61923,7 +62617,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-avx2-u128.c"
++      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61944,7 +62638,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -61953,7 +62647,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-avx2-u128.c"
++      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61977,7 +62671,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -61990,7 +62684,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c"
++      "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62011,7 +62705,7 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -62024,7 +62718,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c"
++      "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62048,7 +62742,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_sse2-no-sse3") {
++  source_set("s8-vclamp_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -62056,7 +62750,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-sse2-u64.c"
++      "src/src/s8-vclamp/s8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62077,7 +62771,7 @@ Index: chromium-150.0.7871.46/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("s8-vclamp_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -62085,7 +62779,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-sse2-u64.c"
++      "src/src/s8-vclamp/s8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62109,14 +62803,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_x64") {
++  source_set("s8-vclamp_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62137,14 +62832,15 @@ Index: chromium-150.0.7871.46/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("s8-vclamp_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62168,79 +62864,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-packw_f16c-fma-avx2") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("x16-packw_f16c-fma-avx2_standalone") {
++  source_set("s8-vclamp_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("x16-transposec_f16c-fma-avx2") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62261,16 +62892,14 @@ Index: chromium-150.0.7871.46/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("s8-vclamp_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/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62294,15 +62923,43 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_sse2-no-sse3") {
++  source_set("subgraph_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.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/fp16_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" ]
@@ -62323,15 +62980,43 @@ Index: chromium-150.0.7871.46/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("subgraph_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/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/fp16_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" ]
@@ -62355,14 +63040,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_x64") {
++  source_set("tables_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.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" ]
@@ -62383,14 +63076,22 @@ Index: chromium-150.0.7871.46/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("tables_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.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" ]
@@ -62414,15 +63115,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_x64") {
++  source_set("u8-ibilinear_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62443,15 +63144,76 @@ Index: chromium-150.0.7871.46/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-ibilinear_sse2-no-sse3_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: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_sse4.1-no-sse4.2") {
++    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-sse41-u16.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# 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") {
++    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62475,15 +63237,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x24-transposec_ssse3-no-sse4.1") {
++  source_set("u8-ibilinear_x64") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/x24-transposec-4x4-ssse3.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62504,15 +63265,14 @@ Index: chromium-150.0.7871.46/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-ibilinear_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/x24-transposec-4x4-ssse3.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62536,14 +63296,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x24-transposec_x64") {
++  source_set("u8-lut32norm_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62564,14 +63324,14 @@ Index: chromium-150.0.7871.46/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-lut32norm_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62595,21 +63355,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_avx-no-avx2-no-f16c-no-fma") {
++  source_set("u8-maxpool_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-gio-avx-u8.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-gio-avx-u8.c",
-+    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-avx-u4.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62630,21 +63384,15 @@ Index: chromium-150.0.7871.46/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-maxpool_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-gio-avx-u8.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-gio-avx-u8.c",
-+    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-avx-u4.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62668,18 +63416,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_avx512f") {
++  source_set("u8-maxpool_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-avx512f-u8.c",
-+    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx512f-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u8.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-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62700,18 +63444,14 @@ Index: chromium-150.0.7871.46/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-maxpool_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-avx512f-u8.c",
-+    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx512f-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u8.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-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62735,7 +63475,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_sse2-no-sse3") {
++  source_set("u8-rdminmax_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -62743,8 +63483,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -62765,7 +63505,7 @@ Index: chromium-150.0.7871.46/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-rdminmax_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -62773,8 +63513,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -62798,19 +63538,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_x64") {
++  source_set("u8-rdminmax_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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-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/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" ]
@@ -62831,19 +63567,15 @@ Index: chromium-150.0.7871.46/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-rdminmax_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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-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/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" ]
@@ -62867,17 +63599,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_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-transposec/gen/x32-transposec-8x8-reuse-multi-avx.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" ]
@@ -62898,17 +63630,17 @@ Index: chromium-150.0.7871.46/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-rminmax_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-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" ]
@@ -62932,15 +63664,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_sse-no-sse2") {
++  source_set("u8-rminmax_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/x32-transposec-4x4-sse.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" ]
@@ -62961,15 +63694,16 @@ Index: chromium-150.0.7871.46/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-rminmax_x64_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/x32-transposec-4x4-sse.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" ]
@@ -62993,14 +63727,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_x64") {
++  source_set("u8-vclamp_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/u8-vclamp/u8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63021,14 +63757,16 @@ Index: chromium-150.0.7871.46/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("u8-vclamp_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/u8-vclamp/u8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63052,15 +63790,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-unpool_sse2-no-sse3") {
++  source_set("u8-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/x32-unpool/x32-unpool-sse2.c"
++      "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63081,15 +63824,20 @@ Index: chromium-150.0.7871.46/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("u8-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/x32-unpool/x32-unpool-sse2.c"
++      "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63113,14 +63861,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-unpool_x64") {
++  source_set("u8-vclamp_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/u8-vclamp/u8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63141,14 +63890,15 @@ Index: chromium-150.0.7871.46/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("u8-vclamp_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/u8-vclamp/u8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63172,17 +63922,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma") {
++  source_set("u8-vclamp_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63203,17 +63950,14 @@ Index: chromium-150.0.7871.46/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("u8-vclamp_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63237,15 +63981,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_sse2-no-sse3") {
++  source_set("x16-packw_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.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" ]
@@ -63266,15 +64012,17 @@ Index: chromium-150.0.7871.46/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-packw_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.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" ]
@@ -63298,14 +64046,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_x64") {
++  source_set("x16-packw_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63326,14 +64074,14 @@ Index: chromium-150.0.7871.46/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-packw_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63357,17 +64105,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_avx-no-avx2-no-f16c-no-fma") {
++  source_set("x16-transposec_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx-u64.c"
++      "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63388,17 +64135,16 @@ Index: chromium-150.0.7871.46/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("x16-transposec_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx-u64.c"
++      "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63422,16 +64168,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_f16c-fma-avx2") {
++  source_set("x16-transposec_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx2-u128.c"
++      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63452,16 +64197,15 @@ Index: chromium-150.0.7871.46/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("x16-transposec_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx2-u128.c"
++      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63485,20 +64229,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("x16-transposec_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63519,20 +64257,14 @@ Index: chromium-150.0.7871.46/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("x16-transposec_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63556,21 +64288,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi") {
++  source_set("x16-x32-packw_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vbmi",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.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" ]
@@ -63591,21 +64317,15 @@ Index: chromium-150.0.7871.46/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("x16-x32-packw_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vbmi",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.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" ]
@@ -63629,14 +64349,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_x64") {
++  source_set("x24-transposec_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x24-transposec/x24-transposec-4x4-ssse3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63657,14 +64378,15 @@ Index: chromium-150.0.7871.46/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("x24-transposec_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x24-transposec/x24-transposec-4x4-ssse3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63688,14 +64410,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-packq_x64") {
++  source_set("x24-transposec_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63716,14 +64438,14 @@ Index: chromium-150.0.7871.46/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("x24-transposec_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63747,17 +64469,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-packw_x64") {
++  source_set("x32-packw_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-avx-u8.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-gio-avx-u8.c",
++    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-avx-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63778,17 +64504,21 @@ Index: chromium-150.0.7871.46/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-packw_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-avx-u8.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-gio-avx-u8.c",
++    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-avx-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63812,16 +64542,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_f16c-fma-avx2") {
++  source_set("x32-packw_avx512f") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
++      "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-avx512f-u8.c",
++    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx512f-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u8.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" ]
@@ -63842,16 +64574,18 @@ Index: chromium-150.0.7871.46/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-packw_avx512f_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
++      "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-avx512f-u8.c",
++    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-avx512f-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-gio-avx512f-u8.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" ]
@@ -63875,7 +64609,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_sse2-no-sse3") {
++  source_set("x32-packw_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -63883,7 +64617,8 @@ Index: chromium-150.0.7871.46/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-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" ]
@@ -63904,7 +64639,7 @@ Index: chromium-150.0.7871.46/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-packw_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -63912,7 +64647,8 @@ Index: chromium-150.0.7871.46/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-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" ]
@@ -63936,14 +64672,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_x64") {
++  source_set("x32-packw_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63964,14 +64705,19 @@ Index: chromium-150.0.7871.46/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-packw_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63995,14 +64741,80 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-copy_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/xx-copy/xx-copy-scalar-memcpy.c"
++      "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/x32-transposec/x32-transposec-4x4-sse.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64023,14 +64835,74 @@ Index: chromium-150.0.7871.46/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("x32-transposec_sse-no-sse2_standalone") {
++    cflags = [
++      "-mno-sse2",
++    "-msse"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-transposec/x32-transposec-4x4-sse.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/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_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/x32-transposec/gen/x32-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" ]
++
++    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_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64054,7 +64926,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-fill_sse2-no-sse3") {
++  source_set("x32-unpool_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -64062,7 +64934,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-sse2-u64.c"
++      "src/src/x32-unpool/x32-unpool-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64083,7 +64955,7 @@ Index: chromium-150.0.7871.46/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("x32-unpool_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -64091,7 +64963,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-sse2-u64.c"
++      "src/src/x32-unpool/x32-unpool-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64115,14 +64987,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-fill_x64") {
++  source_set("x32-unpool_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64143,14 +65015,14 @@ Index: chromium-150.0.7871.46/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") {
++  source_set("x32-unpool_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64174,15 +65046,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-pad_sse2-no-sse3") {
++  source_set("x64-transposec_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/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64203,15 +65077,17 @@ Index: chromium-150.0.7871.46/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("x64-transposec_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/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64235,14 +65111,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-pad_x64") {
++  source_set("x64-transposec_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64263,14 +65140,15 @@ Index: chromium-150.0.7871.46/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("x64-transposec_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64294,14 +65172,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-transposev_x64") {
++  source_set("x64-transposec_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64322,14 +65200,14 @@ Index: chromium-150.0.7871.46/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("x64-transposec_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64352,19 +65230,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  }
 +}
 +
-+}
-+
-+if (current_cpu == "arm64") {
 +if (build_with_chromium) {
-+  source_set("bf16-f32-vcvt_arm64") {
++  source_set("x8-lut_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64385,15 +65262,17 @@ Index: chromium-150.0.7871.46/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_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64417,14 +65296,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("bf16-qs8-vcvt_arm64") {
++  source_set("x8-lut_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64445,14 +65326,16 @@ Index: chromium-150.0.7871.46/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_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64476,19 +65359,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("bf16-rminmax_arm64") {
++  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/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-lut/gen/x8-lut-avx512skx-vpshufb-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64509,19 +65393,20 @@ Index: chromium-150.0.7871.46/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-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-lut/gen/x8-lut-avx512skx-vpshufb-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64545,37 +65430,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("configs_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/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-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64596,37 +65465,21 @@ Index: chromium-150.0.7871.46/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-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/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-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64650,18 +65503,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("enums_arm64") {
++  source_set("x8-lut_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-lut/gen/x8-lut-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64682,18 +65531,14 @@ Index: chromium-150.0.7871.46/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-lut_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-lut/gen/x8-lut-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64717,14 +65562,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-avgpool_arch=armv8.2-a+fp16") {
++  source_set("x8-packq_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/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64745,14 +65590,14 @@ Index: chromium-150.0.7871.46/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("x8-packq_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/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64776,14 +65621,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16") {
++  source_set("x8-packw_x64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64804,14 +65652,17 @@ Index: chromium-150.0.7871.46/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("x8-packw_x64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64835,17 +65686,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16") {
++  source_set("x8-transposec_f16c-fma-avx2") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64866,17 +65716,16 @@ Index: chromium-150.0.7871.46/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("x8-transposec_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64900,18 +65749,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-dwconv_arch=armv8.2-a+fp16") {
++  source_set("x8-transposec_sse2-no-sse3") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64932,18 +65778,15 @@ Index: chromium-150.0.7871.46/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("x8-transposec_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64967,16 +65810,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_arm64") {
++  source_set("x8-transposec_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64997,16 +65838,14 @@ Index: chromium-150.0.7871.46/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("x8-transposec_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65030,14 +65869,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16") {
++  source_set("xx-copy_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-copy/xx-copy-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65058,14 +65897,14 @@ Index: chromium-150.0.7871.46/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-copy_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-copy/xx-copy-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65089,14 +65928,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_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-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
++      "src/src/xx-fill/xx-fill-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65117,14 +65957,15 @@ Index: chromium-150.0.7871.46/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-fill_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
++      "src/src/xx-fill/xx-fill-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65148,14 +65989,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
++  source_set("xx-fill_x64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65176,14 +66017,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16_standalone") {
++  source_set("xx-fill_x64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65207,14 +66048,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16") {
++  source_set("xx-pad_sse2-no-sse3") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
++      "src/src/xx-pad/xx-pad-p16-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65235,14 +66077,15 @@ Index: chromium-150.0.7871.46/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("xx-pad_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
++      "src/src/xx-pad/xx-pad-p16-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65266,17 +66109,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-gemm_arch=armv8.2-a+fp16") {
++  source_set("xx-pad_x64") {
 +    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/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65297,17 +66137,14 @@ Index: chromium-150.0.7871.46/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("xx-pad_x64_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/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65331,21 +66168,77 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("xx-transposev_x64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
 +
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("xx-transposev_x64_standalone") {
++    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/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool: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("bf16-f32-vcvt_arm64") {
++    cflags = [
++  
++    ]
++  
++    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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65366,21 +66259,74 @@ Index: chromium-150.0.7871.46/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-f32-vcvt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/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-qs8-vcvt_arm64") {
++    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-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" ]
++
++    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-qs8-vcvt_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65404,14 +66350,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16") {
++  source_set("bf16-qu8-vcvt_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-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65432,14 +66378,14 @@ Index: chromium-150.0.7871.46/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-qu8-vcvt_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-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65463,14 +66409,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-ibilinear_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/gen/f16-ibilinear-neonfp16arith-u8.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" ]
@@ -65491,14 +66442,19 @@ Index: chromium-150.0.7871.46/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("bf16-rminmax_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/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" ]
@@ -65522,17 +66478,37 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16") {
++  source_set("configs_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/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" ]
@@ -65553,17 +66529,37 @@ Index: chromium-150.0.7871.46/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("configs_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/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" ]
@@ -65587,21 +66583,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("enums_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  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/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" ]
@@ -65622,21 +66615,18 @@ Index: chromium-150.0.7871.46/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("enums_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  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/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" ]
@@ -65660,14 +66650,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_arch=armv8.2-a+fp16") {
++  source_set("f16-avgpool_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-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65688,14 +66678,14 @@ Index: chromium-150.0.7871.46/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-avgpool_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-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65719,14 +66709,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_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-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
++      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65747,14 +66737,14 @@ Index: chromium-150.0.7871.46/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-conv-hwc2chw_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-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65778,14 +66768,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_arm64") {
++  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-scalar-imagic-u4.c"
++      "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
++    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
++    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
++    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65806,14 +66799,17 @@ Index: chromium-150.0.7871.46/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-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-scalar-imagic-u4.c"
++      "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
++    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
++    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
++    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65837,14 +66833,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qu8-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-qu8-vcvt/gen/f16-qu8-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" ]
@@ -65865,14 +66865,18 @@ Index: chromium-150.0.7871.46/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-dwconv_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-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" ]
@@ -65896,14 +66900,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16") {
++  source_set("f16-f32-vcvt_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.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" ]
@@ -65924,14 +66930,16 @@ Index: chromium-150.0.7871.46/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-f32-vcvt_arm64_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-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" ]
@@ -65955,15 +66963,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_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-rdminmax/gen/f16-rdmax-2p2x-neonfp16arith-u32.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-neonfp16arith-u32.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65984,15 +66991,14 @@ Index: chromium-150.0.7871.46/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-rdsum2_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-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66016,15 +67022,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_arm64") {
++  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-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66045,15 +67050,14 @@ Index: chromium-150.0.7871.46/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-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-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66077,16 +67081,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_arch=armv8.2-a+fp16") {
++  source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-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-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66107,16 +67109,14 @@ Index: chromium-150.0.7871.46/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-rsum2_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-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66140,16 +67140,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_arm64") {
++  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-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-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66170,16 +67168,14 @@ Index: chromium-150.0.7871.46/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-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-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-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66203,14 +67199,17 @@ Index: chromium-150.0.7871.46/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") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
++      "src/src/f16-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" ]
@@ -66231,14 +67230,17 @@ Index: chromium-150.0.7871.46/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_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
++      "src/src/f16-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" ]
@@ -66262,14 +67264,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.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" ]
@@ -66290,14 +67299,21 @@ Index: chromium-150.0.7871.46/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-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-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.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" ]
@@ -66321,14 +67337,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_arm64") {
++  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-scalar-rational-6-4-div.c"
++      "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66349,14 +67365,14 @@ Index: chromium-150.0.7871.46/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-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-scalar-rational-6-4-div.c"
++      "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66380,35 +67396,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_arch=armv8.2-a+fp16") {
++  source_set("f16-ibilinear_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-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-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66429,35 +67424,14 @@ Index: chromium-150.0.7871.46/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-ibilinear_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-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66481,14 +67455,17 @@ Index: chromium-150.0.7871.46/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") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-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" ]
@@ -66509,14 +67486,17 @@ Index: chromium-150.0.7871.46/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_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
++      "src/src/f16-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" ]
@@ -66540,14 +67520,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcmul_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-vcmul/gen/f16-vcmul-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" ]
@@ -66568,14 +67555,21 @@ Index: chromium-150.0.7871.46/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-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-vcmul/gen/f16-vcmul-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" ]
@@ -66599,14 +67593,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcos_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-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66627,14 +67621,14 @@ Index: chromium-150.0.7871.46/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-maxpool_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-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66658,14 +67652,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcos_arm64") {
++  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-scalar-rational-3-2-div.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66686,14 +67680,14 @@ Index: chromium-150.0.7871.46/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_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66717,14 +67711,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-velu_arch=armv8.2-a+fp16") {
++  source_set("f16-qs8-vcvt_arm64") {
 +    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-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66745,14 +67739,14 @@ Index: chromium-150.0.7871.46/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-qs8-vcvt_arm64_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-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66776,14 +67770,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vexp_arch=armv8.2-a+fp16") {
++  source_set("f16-qu8-vcvt_arm64") {
 +    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-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66804,14 +67798,14 @@ Index: chromium-150.0.7871.46/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-qu8-vcvt_arm64_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-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66835,14 +67829,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vexp_arm64") {
++  source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66863,14 +67857,14 @@ Index: chromium-150.0.7871.46/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-raddstoreexpminusmax_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66894,14 +67888,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_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-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-neonfp16arith-u32.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66922,14 +67917,15 @@ Index: chromium-150.0.7871.46/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-rdminmax_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-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" ]
@@ -66953,14 +67949,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_arm64") {
++  source_set("f16-rdminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66981,14 +67978,15 @@ Index: chromium-150.0.7871.46/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-rdminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67012,14 +68010,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vhswish_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-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
++      "src/src/f16-rminmax/gen/f16-rmax-neonfp16arith-u32-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-neonfp16arith-u32-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-neonfp16arith-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67040,14 +68040,16 @@ Index: chromium-150.0.7871.46/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-rminmax_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-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" ]
@@ -67071,14 +68073,77 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vlog_arch=armv8.2-a+fp16") {
++  source_set("f16-rminmax_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/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-spmm_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-3-3-div.c"
++      "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67099,14 +68164,14 @@ Index: chromium-150.0.7871.46/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-spmm_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-3-3-div.c"
++      "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67130,73 +68195,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vlog_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-vlog_arm64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("f16-vlrelu_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-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67217,14 +68223,14 @@ Index: chromium-150.0.7871.46/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-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67248,14 +68254,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vmulcaddc_arch=armv8.2-a+fp16") {
++  source_set("f16-vapproxgelu_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
++      "src/src/f16-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" ]
@@ -67276,14 +68283,15 @@ Index: chromium-150.0.7871.46/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-vapproxgelu_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
++      "src/src/f16-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" ]
@@ -67307,17 +68315,35 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vrnd_arch=armv8.2-a+fp16") {
++  source_set("f16-vbinary_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-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-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" ]
@@ -67338,17 +68364,35 @@ Index: chromium-150.0.7871.46/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-vbinary_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-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" ]
@@ -67372,14 +68416,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vrsqrt_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-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67400,14 +68444,14 @@ Index: chromium-150.0.7871.46/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-vclamp_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67431,15 +68475,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsigmoid_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-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-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67460,15 +68503,14 @@ Index: chromium-150.0.7871.46/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-vcmul_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-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67492,14 +68534,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsin_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-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c"
++      "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67520,14 +68562,14 @@ Index: chromium-150.0.7871.46/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-vcos_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-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67551,14 +68593,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsin_arm64") {
++  source_set("f16-vcos_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67579,14 +68621,14 @@ Index: chromium-150.0.7871.46/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-vcos_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67610,15 +68652,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_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-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c",
-+    "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c"
++      "src/src/f16-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67639,74 +68680,14 @@ Index: chromium-150.0.7871.46/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-velu_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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/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_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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" ]
-+
-+    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-vsqrt_arm64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
++      "src/src/f16-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67730,15 +68711,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_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-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
-+    "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c"
++      "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67759,15 +68739,14 @@ Index: chromium-150.0.7871.46/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-vexp_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
-+    "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c"
++      "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67791,14 +68770,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_arm64") {
++  source_set("f16-vexp_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67819,14 +68798,14 @@ Index: chromium-150.0.7871.46/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-vexp_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67850,16 +68829,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vunary_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-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-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67880,16 +68857,14 @@ Index: chromium-150.0.7871.46/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-vgelu_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-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67913,15 +68888,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_arm64") {
++  source_set("f16-vgelu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
-+    "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67942,15 +68916,14 @@ Index: chromium-150.0.7871.46/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-vgelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
-+    "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67974,15 +68947,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_arm64") {
++  source_set("f16-vhswish_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-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68003,15 +68975,14 @@ Index: chromium-150.0.7871.46/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-vhswish_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c",
-+    "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68035,14 +69006,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16") {
++  source_set("f16-vlog_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-vlog/gen/f16-vlog-neonfp16arith-rational-1-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68063,14 +69034,14 @@ Index: chromium-150.0.7871.46/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-vlog_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-vlog/gen/f16-vlog-neonfp16arith-rational-1-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68094,15 +69065,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_arm64") {
++  source_set("f16-vlog_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neon-u8.c",
-+    "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/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" ]
@@ -68123,15 +69094,15 @@ Index: chromium-150.0.7871.46/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-vlog_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neon-u8.c",
-+    "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/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" ]
@@ -68155,16 +69126,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_arm64") {
++  source_set("f16-vlrelu_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68185,16 +69154,14 @@ Index: chromium-150.0.7871.46/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-vlrelu_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68218,29 +69185,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_arm64") {
++  source_set("f16-vmulcaddc_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-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68261,29 +69213,14 @@ Index: chromium-150.0.7871.46/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-vmulcaddc_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-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68307,16 +69244,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-vrnd_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-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
++      "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" ]
@@ -68337,16 +69275,17 @@ Index: chromium-150.0.7871.46/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-vrnd_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-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
++      "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" ]
@@ -68370,31 +69309,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_arm64") {
++  source_set("f16-vrsqrt_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-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68415,31 +69337,14 @@ Index: chromium-150.0.7871.46/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-vrsqrt_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-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68463,16 +69368,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_arm64") {
++  source_set("f16-vsigmoid_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -68493,16 +69397,15 @@ Index: chromium-150.0.7871.46/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-vsigmoid_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -68526,36 +69429,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-vsin_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-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68576,36 +69457,14 @@ Index: chromium-150.0.7871.46/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-vsin_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-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68629,30 +69488,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-gemm_arm64") {
++  source_set("f16-vsin_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/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68673,30 +69516,14 @@ Index: chromium-150.0.7871.46/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("f16-vsin_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/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68720,16 +69547,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-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-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/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" ]
@@ -68750,16 +69576,15 @@ Index: chromium-150.0.7871.46/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("f16-vsqrt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -68783,16 +69608,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_arm64") {
++  source_set("f16-vsqrt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68813,16 +69636,14 @@ Index: chromium-150.0.7871.46/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("f16-vsqrt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68846,33 +69667,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-vtanh_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-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/f16-vtanh/gen/f16-vtanh-neonfp16arith-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68893,33 +69695,14 @@ Index: chromium-150.0.7871.46/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("f16-vtanh_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-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/f16-vtanh/gen/f16-vtanh-neonfp16arith-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68943,30 +69726,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-igemm_arm64") {
++  source_set("f16-vtanh_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/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" ]
@@ -68987,30 +69755,15 @@ Index: chromium-150.0.7871.46/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("f16-vtanh_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/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" ]
@@ -69034,15 +69787,78 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_arm64") {
++  source_set("f16-vunary_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-vunary_arch=armv8.2-a+fp16_standalone") {
++    cflags = [
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f32-argmaxpool_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
++    "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69063,15 +69879,15 @@ Index: chromium-150.0.7871.46/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-argmaxpool_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-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
++    "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69095,20 +69911,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_arm64") {
++  source_set("f32-avgpool_arm64") {
 +    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-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" ]
@@ -69129,20 +69940,15 @@ Index: chromium-150.0.7871.46/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-avgpool_arm64_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-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-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" ]
@@ -69166,18 +69972,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+bf16"
 +    ]
 +  
-+  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-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69198,18 +70000,14 @@ Index: chromium-150.0.7871.46/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-bf16-vcvt_arch=armv8.2-a+bf16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+bf16"
 +    ]
 +  
-+  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-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69233,19 +70031,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_arm64") {
++  source_set("f32-bf16-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-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" ]
@@ -69266,19 +70060,15 @@ Index: chromium-150.0.7871.46/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-bf16-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-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" ]
@@ -69302,17 +70092,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_arm64") {
++  source_set("f32-conv-hwc2chw_arm64") {
 +    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-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" ]
@@ -69333,17 +70122,16 @@ Index: chromium-150.0.7871.46/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-conv-hwc2chw_arm64_standalone") {
 +    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-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" ]
@@ -69367,17 +70155,29 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_arm64") {
++  source_set("f32-dwconv2d-chw_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-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" ]
@@ -69398,17 +70198,29 @@ Index: chromium-150.0.7871.46/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-dwconv2d-chw_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-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" ]
@@ -69432,15 +70244,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_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-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-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69461,15 +70274,16 @@ Index: chromium-150.0.7871.46/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-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-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-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69493,17 +70307,31 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_arm64") {
++  source_set("f32-dwconv_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-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" ]
@@ -69524,17 +70352,31 @@ Index: chromium-150.0.7871.46/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-dwconv_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-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" ]
@@ -69558,15 +70400,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_arm64") {
++  source_set("f32-f16-vcvt_arm64") {
 +    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-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" ]
@@ -69587,15 +70430,16 @@ Index: chromium-150.0.7871.46/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-f16-vcvt_arm64_standalone") {
 +    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-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" ]
@@ -69619,15 +70463,36 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_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-rdsum/gen/f32-rdsum-7p7x-minmax-neon-u16.c",
-+    "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.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" ]
@@ -69648,15 +70513,36 @@ Index: chromium-150.0.7871.46/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-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-rdsum/gen/f32-rdsum-7p7x-minmax-neon-u16.c",
-+    "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.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" ]
@@ -69680,19 +70566,30 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_arm64") {
++  source_set("f32-gemm_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-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" ]
@@ -69713,19 +70610,30 @@ Index: chromium-150.0.7871.46/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-gemm_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-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" ]
@@ -69749,15 +70657,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_arm64") {
++  source_set("f32-ibilinear-chw_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-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" ]
@@ -69778,15 +70687,16 @@ Index: chromium-150.0.7871.46/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-ibilinear-chw_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-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" ]
@@ -69810,15 +70720,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rsum_arm64") {
++  source_set("f32-ibilinear_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-neon-u16-acc4.c",
-+    "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "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" ]
@@ -69839,15 +70750,16 @@ Index: chromium-150.0.7871.46/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-ibilinear_arm64_standalone") {
 +    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-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" ]
@@ -69871,20 +70783,33 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-spmm_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-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-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" ]
@@ -69905,20 +70830,33 @@ Index: chromium-150.0.7871.46/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-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-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-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" ]
@@ -69942,15 +70880,30 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_arm64") {
++  source_set("f32-igemm_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-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" ]
@@ -69971,15 +70924,30 @@ Index: chromium-150.0.7871.46/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-igemm_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-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" ]
@@ -70003,51 +70971,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_arm64") {
++  source_set("f32-maxpool_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-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" ]
@@ -70068,51 +71000,15 @@ Index: chromium-150.0.7871.46/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-maxpool_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-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" ]
@@ -70136,15 +71032,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_arm64") {
++  source_set("f32-qc4w-gemm_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-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" ]
@@ -70165,15 +71066,20 @@ Index: chromium-150.0.7871.46/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-qc4w-gemm_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-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" ]
@@ -70197,15 +71103,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_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-vcmul/gen/f32-vcmul-neon-u8.c",
-+    "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.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" ]
@@ -70226,15 +71135,18 @@ Index: chromium-150.0.7871.46/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-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-vcmul/gen/f32-vcmul-neon-u8.c",
-+    "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.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" ]
@@ -70258,19 +71170,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_arm64") {
++  source_set("f32-qc8w-gemm_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-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" ]
@@ -70291,19 +71203,19 @@ Index: chromium-150.0.7871.46/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-qc8w-gemm_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-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" ]
@@ -70327,15 +71239,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vcos_arm64") {
++  source_set("f32-qs8-vcvt_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-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" ]
@@ -70356,15 +71270,17 @@ Index: chromium-150.0.7871.46/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-qs8-vcvt_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-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" ]
@@ -70388,17 +71304,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-velu_arm64") {
++  source_set("f32-qu8-vcvt_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-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" ]
@@ -70419,17 +71335,17 @@ Index: chromium-150.0.7871.46/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-qu8-vcvt_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-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" ]
@@ -70453,15 +71369,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vexp_arm64") {
++  source_set("f32-raddstoreexpminusmax_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-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" ]
@@ -70482,15 +71398,15 @@ Index: chromium-150.0.7871.46/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-raddstoreexpminusmax_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-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" ]
@@ -70514,15 +71430,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_arm64") {
++  source_set("f32-rdminmax_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-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" ]
@@ -70543,15 +71461,17 @@ Index: chromium-150.0.7871.46/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-rdminmax_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-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" ]
@@ -70575,15 +71495,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_arm64") {
++  source_set("f32-rdsum2_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-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" ]
@@ -70604,15 +71524,15 @@ Index: chromium-150.0.7871.46/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-rdsum2_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-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" ]
@@ -70636,15 +71556,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlog_arm64") {
++  source_set("f32-rdsum_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-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" ]
@@ -70665,15 +71585,15 @@ Index: chromium-150.0.7871.46/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-rdsum_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-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" ]
@@ -70697,15 +71617,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_arm64") {
++  source_set("f32-rminmax_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-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" ]
@@ -70726,15 +71650,19 @@ Index: chromium-150.0.7871.46/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-rminmax_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-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" ]
@@ -70758,16 +71686,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_arm64") {
++  source_set("f32-rsum2_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-rsum2/gen/f32-rsum2-neon.c",
++    "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -70788,16 +71715,15 @@ Index: chromium-150.0.7871.46/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-rsum2_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-rsum2/gen/f32-rsum2-neon.c",
++    "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -70821,25 +71747,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_arm64") {
++  source_set("f32-rsum_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-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" ]
@@ -70860,25 +71776,15 @@ Index: chromium-150.0.7871.46/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-rsum_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-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" ]
@@ -70902,16 +71808,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_arm64") {
++  source_set("f32-spmm_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-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" ]
@@ -70932,16 +71842,20 @@ Index: chromium-150.0.7871.46/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-spmm_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-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" ]
@@ -70965,16 +71879,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_arm64") {
++  source_set("f32-vapproxgelu_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-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" ]
@@ -70995,16 +71908,15 @@ Index: chromium-150.0.7871.46/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-vapproxgelu_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-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" ]
@@ -71028,15 +71940,51 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_arm64") {
++  source_set("f32-vbinary_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-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" ]
@@ -71057,15 +72005,51 @@ Index: chromium-150.0.7871.46/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-vbinary_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-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" ]
@@ -71089,15 +72073,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_arm64") {
++  source_set("f32-vclamp_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-vclamp/gen/f32-vclamp-neon.c",
++    "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71118,15 +72102,15 @@ Index: chromium-150.0.7871.46/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-vclamp_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-vclamp/gen/f32-vclamp-neon.c",
++    "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71150,15 +72134,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_arm64") {
++  source_set("f32-vcmul_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-vcmul/gen/f32-vcmul-neon-u8.c",
++    "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71179,15 +72163,15 @@ Index: chromium-150.0.7871.46/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-vcmul_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-vcmul/gen/f32-vcmul-neon-u8.c",
++    "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71211,19 +72195,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vunary_arm64") {
++  source_set("f32-vcopysign_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-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" ]
@@ -71244,19 +72228,19 @@ Index: chromium-150.0.7871.46/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-vcopysign_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-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" ]
@@ -71280,36 +72264,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("operators_arm64") {
++  source_set("f32-vcos_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-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" ]
@@ -71330,36 +72293,15 @@ Index: chromium-150.0.7871.46/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-vcos_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-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" ]
@@ -71383,15 +72325,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-velu_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-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" ]
@@ -71412,15 +72356,17 @@ Index: chromium-150.0.7871.46/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-velu_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-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" ]
@@ -71444,17 +72390,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-vexp_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-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" ]
@@ -71475,17 +72419,15 @@ Index: chromium-150.0.7871.46/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-vexp_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-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" ]
@@ -71509,17 +72451,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf32-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-vgelu_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-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" ]
@@ -71540,17 +72480,15 @@ Index: chromium-150.0.7871.46/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-vgelu_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-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" ]
@@ -71574,15 +72512,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf32-igemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-vhswish_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-vhswish/gen/f32-vhswish-neon.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71603,15 +72541,15 @@ Index: chromium-150.0.7871.46/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-vhswish_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-vhswish/gen/f32-vhswish-neon.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71635,15 +72573,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-vlog_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-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" ]
@@ -71664,15 +72602,15 @@ Index: chromium-150.0.7871.46/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-vlog_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-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" ]
@@ -71696,16 +72634,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pqs8-qc8w-gemm_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/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-vlrelu/gen/f32-vlrelu-neon-u8.c",
++    "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71726,16 +72663,15 @@ Index: chromium-150.0.7871.46/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-vlrelu_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-vlrelu/gen/f32-vlrelu-neon-u8.c",
++    "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71759,15 +72695,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qb4-packw_arch=armv8.2-a+dotprod") {
++  source_set("f32-vmulcaddc_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-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" ]
@@ -71788,15 +72725,16 @@ Index: chromium-150.0.7871.46/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-vmulcaddc_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-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" ]
@@ -71820,15 +72758,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("f32-vrnd_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++  
 +    ]
 +  
 +    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/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" ]
@@ -71849,15 +72797,25 @@ Index: chromium-150.0.7871.46/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("f32-vrnd_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++  
 +    ]
 +  
 +    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/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" ]
@@ -71881,15 +72839,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16") {
++  source_set("f32-vrsqrt_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    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/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" ]
@@ -71910,15 +72869,16 @@ Index: chromium-150.0.7871.46/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("f32-vrsqrt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    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/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" ]
@@ -71942,15 +72902,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-vsigmoid_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c"
++      "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" ]
@@ -71971,15 +72932,16 @@ Index: chromium-150.0.7871.46/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("f32-vsigmoid_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c"
++      "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" ]
@@ -72003,16 +72965,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("f32-vsin_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++  
 +    ]
 +  
 +    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/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" ]
@@ -72033,16 +72994,15 @@ Index: chromium-150.0.7871.46/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("f32-vsin_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++  
 +    ]
 +  
 +    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/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" ]
@@ -72066,14 +73026,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_arm64") {
++  source_set("f32-vsqrt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.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" ]
@@ -72094,14 +73055,15 @@ Index: chromium-150.0.7871.46/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("f32-vsqrt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.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" ]
@@ -72125,76 +73087,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16") {
-+    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
-+    ]
-+  
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
++  source_set("f32-vtanh_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
-+    ]
 +  
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/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-qc4w-gemm_arch=armv8.2-a+fp16") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -72215,15 +73116,15 @@ Index: chromium-150.0.7871.46/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("f32-vtanh_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    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/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" ]
@@ -72247,15 +73148,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-vunary_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    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/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" ]
@@ -72276,15 +73181,19 @@ Index: chromium-150.0.7871.46/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("f32-vunary_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    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/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" ]
@@ -72308,17 +73217,36 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("operators_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/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" ]
@@ -72339,17 +73267,36 @@ Index: chromium-150.0.7871.46/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("operators_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/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" ]
@@ -72373,15 +73320,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16") {
++  source_set("pf16-f16-f16-igemm_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-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/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" ]
@@ -72402,15 +73349,15 @@ Index: chromium-150.0.7871.46/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("pf16-f16-f16-igemm_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-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/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" ]
@@ -72434,17 +73381,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("pf16-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/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/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" ]
@@ -72465,17 +73412,17 @@ Index: chromium-150.0.7871.46/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("pf16-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/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/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" ]
@@ -72499,15 +73446,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("pf32-gemm_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-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/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" ]
@@ -72528,15 +73477,17 @@ Index: chromium-150.0.7871.46/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("pf32-gemm_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-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/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" ]
@@ -72560,17 +73511,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("pf32-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-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/pf32-igemm/pf32-igemm-32x32-minmax-neonsme.c",
++    "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72591,17 +73540,15 @@ Index: chromium-150.0.7871.46/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("pf32-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-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/pf32-igemm/pf32-igemm-32x32-minmax-neonsme.c",
++    "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72625,15 +73572,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16") {
++  source_set("pqs8-f32-qc8w-igemm_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-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"
++      "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" ]
@@ -72654,15 +73601,15 @@ Index: chromium-150.0.7871.46/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_standalone") {
++  source_set("pqs8-f32-qc8w-igemm_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-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"
++      "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" ]
@@ -72686,17 +73633,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("pqs8-qc8w-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/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/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" ]
@@ -72717,17 +73663,77 @@ Index: chromium-150.0.7871.46/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("pqs8-qc8w-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/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" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
 +
++if (build_with_chromium) {
++  source_set("qb4-packw_arch=armv8.2-a+dotprod") {
++    cflags = [
++      "-march=armv8.2-a+dotprod"
++    ]
++  
 +    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/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" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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("qb4-packw_arch=armv8.2-a+dotprod_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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72751,15 +73757,15 @@ Index: chromium-150.0.7871.46/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-qb4w-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-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" ]
@@ -72780,15 +73786,15 @@ Index: chromium-150.0.7871.46/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-qb4w-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-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" ]
@@ -72812,15 +73818,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f16-qb4w-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-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" ]
@@ -72841,15 +73847,15 @@ Index: chromium-150.0.7871.46/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-qb4w-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-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" ]
@@ -72873,15 +73879,15 @@ Index: chromium-150.0.7871.46/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-qb4w-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-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" ]
@@ -72902,15 +73908,15 @@ Index: chromium-150.0.7871.46/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-qb4w-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-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" ]
@@ -72934,17 +73940,77 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_arm64") {
++  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-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" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-qc2w-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-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" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/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-qc2w-gemm_arm64") {
++    cflags = [
++  
++    ]
++  
++    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" ]
@@ -72965,17 +74031,14 @@ Index: chromium-150.0.7871.46/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-qc2w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72999,16 +74062,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+dotprod+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-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" ]
@@ -73029,16 +74091,15 @@ Index: chromium-150.0.7871.46/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-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+dotprod+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-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" ]
@@ -73062,14 +74123,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_arm64") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.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" ]
@@ -73090,14 +74152,15 @@ Index: chromium-150.0.7871.46/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_arm64_standalone") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.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" ]
@@ -73121,15 +74184,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f16-qc4w-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-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-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" ]
@@ -73150,76 +74213,15 @@ Index: chromium-150.0.7871.46/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") {
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-qc4w-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-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-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" ]
@@ -73243,17 +74245,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-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-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-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" ]
@@ -73274,17 +74276,17 @@ Index: chromium-150.0.7871.46/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-gemm_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-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" ]
@@ -73308,17 +74310,15 @@ Index: chromium-150.0.7871.46/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-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-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-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" ]
@@ -73339,17 +74339,15 @@ Index: chromium-150.0.7871.46/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-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-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-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" ]
@@ -73373,7 +74371,7 @@ Index: chromium-150.0.7871.46/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-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16+dotprod"
 +    ]
@@ -73382,8 +74380,8 @@ Index: chromium-150.0.7871.46/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-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" ]
@@ -73404,7 +74402,7 @@ Index: chromium-150.0.7871.46/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-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16+dotprod"
 +    ]
@@ -73413,8 +74411,8 @@ Index: chromium-150.0.7871.46/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-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" ]
@@ -73438,15 +74436,15 @@ Index: chromium-150.0.7871.46/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-gemm_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-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" ]
@@ -73467,15 +74465,15 @@ Index: chromium-150.0.7871.46/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-gemm_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-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" ]
@@ -73499,20 +74497,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-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-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-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" ]
@@ -73533,20 +74528,17 @@ Index: chromium-150.0.7871.46/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-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-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-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" ]
@@ -73570,17 +74562,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_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-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-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" ]
@@ -73601,17 +74591,15 @@ Index: chromium-150.0.7871.46/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-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-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-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" ]
@@ -73635,7 +74623,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_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"
 +    ]
@@ -73644,8 +74632,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +    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-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" ]
@@ -73666,7 +74654,7 @@ Index: chromium-150.0.7871.46/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-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16+dotprod"
 +    ]
@@ -73675,8 +74663,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +    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-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" ]
@@ -73700,15 +74688,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_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-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-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" ]
@@ -73729,15 +74717,15 @@ Index: chromium-150.0.7871.46/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-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-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-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" ]
@@ -73761,22 +74749,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_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-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-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" ]
@@ -73797,22 +74778,15 @@ Index: chromium-150.0.7871.46/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-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -73836,16 +74810,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qb4w-gemm_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/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-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" ]
@@ -73866,16 +74839,15 @@ Index: chromium-150.0.7871.46/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-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/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-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" ]
@@ -73899,14 +74871,17 @@ Index: chromium-150.0.7871.46/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-qb4w-gemm_arm64") {
 +    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-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" ]
@@ -73927,14 +74902,17 @@ Index: chromium-150.0.7871.46/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-qb4w-gemm_arm64_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-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" ]
@@ -73958,16 +74936,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -73988,16 +74966,16 @@ Index: chromium-150.0.7871.46/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-qc2w-gemm_arch=armv8.2-a+dotprod_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-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" ]
@@ -74021,74 +74999,14 @@ Index: chromium-150.0.7871.46/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-qc2w-gemm_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
-+    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
-+    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-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-qc4w-gemm_arch=armv8.2-a+sve+sve2") {
-+    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "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-neonsme2.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74109,15 +75027,14 @@ Index: chromium-150.0.7871.46/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-qc2w-gemm_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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-neonsme2.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74141,16 +75058,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc8w-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-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-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" ]
@@ -74171,16 +75087,15 @@ Index: chromium-150.0.7871.46/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-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -74204,14 +75119,15 @@ Index: chromium-150.0.7871.46/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-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c"
++      "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" ]
@@ -74232,14 +75148,15 @@ Index: chromium-150.0.7871.46/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-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-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-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" ]
@@ -74263,17 +75180,17 @@ Index: chromium-150.0.7871.46/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-qc4w-gemm_arm64") {
 +    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"
++      "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" ]
@@ -74294,17 +75211,17 @@ Index: chromium-150.0.7871.46/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-qc4w-gemm_arm64_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"
++      "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" ]
@@ -74328,20 +75245,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_arm64") {
++  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -74362,20 +75276,17 @@ Index: chromium-150.0.7871.46/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-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -74399,14 +75310,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16") {
++  source_set("qd8-f32-qc8w-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/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.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" ]
@@ -74427,14 +75341,17 @@ Index: chromium-150.0.7871.46/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-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/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.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" ]
@@ -74458,15 +75375,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_arm64") {
++  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -74487,15 +75404,15 @@ Index: chromium-150.0.7871.46/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-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -74519,17 +75436,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_arm64") {
++  source_set("qd8-f32-qc8w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/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" ]
@@ -74550,17 +75470,20 @@ Index: chromium-150.0.7871.46/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("qd8-f32-qc8w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/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" ]
@@ -74584,15 +75507,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f32-qc8w-igemm_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/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" ]
@@ -74613,15 +75538,17 @@ Index: chromium-150.0.7871.46/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("qd8-f32-qc8w-igemm_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/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" ]
@@ -74645,17 +75572,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_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-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/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" ]
@@ -74676,17 +75603,17 @@ Index: chromium-150.0.7871.46/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("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-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/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" ]
@@ -74710,17 +75637,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
-+  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/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" ]
@@ -74741,17 +75666,15 @@ Index: chromium-150.0.7871.46/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("qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
-+  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/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" ]
@@ -74775,15 +75698,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_arm64") {
++  source_set("qd8-f32-qc8w-igemm_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/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" ]
@@ -74804,15 +75734,22 @@ Index: chromium-150.0.7871.46/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("qd8-f32-qc8w-igemm_arm64_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/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" ]
@@ -74836,27 +75773,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_arm64") {
++  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-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/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" ]
@@ -74877,27 +75803,16 @@ Index: chromium-150.0.7871.46/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("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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/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" ]
@@ -74921,17 +75836,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qp8-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/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/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74952,17 +75864,14 @@ Index: chromium-150.0.7871.46/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("qp8-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/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/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74986,25 +75895,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+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/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" ]
@@ -75025,25 +75925,16 @@ Index: chromium-150.0.7871.46/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("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+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/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" ]
@@ -75067,15 +75958,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  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-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/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75096,15 +75986,14 @@ Index: chromium-150.0.7871.46/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("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-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/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75128,20 +76017,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arm64") {
++  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    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/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" ]
@@ -75162,20 +76048,80 @@ Index: chromium-150.0.7871.46/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("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
++      "-march=armv8.2-a+sve+sve2"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x64c4-neonsme.c",
++    "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x64c4-neonsme2.c",
++    "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x64c4-neonsme.c",
++    "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x64c4-neonsme2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool: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+dotprod") {
++    cflags = [
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c4-mstep4-aarch64-neondot.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c4-aarch64-neondot.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c8-aarch64-neondot.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    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+dotprod_standalone") {
++    cflags = [
++      "-march=armv8.2-a+dotprod"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c4-mstep4-aarch64-neondot.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c4-aarch64-neondot.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c8-aarch64-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75199,17 +76145,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod") {
++  source_set("qp8-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/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/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75230,17 +76173,14 @@ Index: chromium-150.0.7871.46/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("qp8-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/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/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75264,25 +76204,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qp8-f32-qc8w-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-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/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" ]
@@ -75303,25 +76235,17 @@ Index: chromium-150.0.7871.46/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("qp8-f32-qc8w-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-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/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" ]
@@ -75345,15 +76269,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qs8-dwconv_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    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-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" ]
@@ -75374,15 +76303,20 @@ Index: chromium-150.0.7871.46/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-dwconv_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    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-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" ]
@@ -75406,20 +76340,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arm64") {
++  source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75440,20 +76368,14 @@ Index: chromium-150.0.7871.46/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-f16-vcvt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75477,14 +76399,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_arm64") {
++  source_set("qs8-f32-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.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" ]
@@ -75505,14 +76428,15 @@ Index: chromium-150.0.7871.46/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-f32-vcvt_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-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" ]
@@ -75536,15 +76460,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_arm64") {
++  source_set("qs8-packw_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-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75565,15 +76491,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_arm64_standalone") {
++  source_set("qs8-packw_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-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75597,14 +76525,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-neondot-u32-acc2.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" ]
@@ -75625,14 +76554,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# 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-qc2w-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-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" ]
@@ -75656,15 +76586,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_arm64") {
++  source_set("qs8-qc2w-gemm_arm64") {
 +    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-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" ]
@@ -75685,15 +76617,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_arm64_standalone") {
++  source_set("qs8-qc2w-gemm_arm64_standalone") {
 +    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-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" ]
@@ -75717,82 +76651,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-vadd_arm64_standalone") {
++  source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/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("qs8-vaddc_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-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" ]
@@ -75813,17 +76682,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_arm64_standalone") {
++  source_set("qs8-qc4w-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-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-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" ]
@@ -75847,15 +76716,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_arm64") {
++  source_set("qs8-qc4w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-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" ]
@@ -75876,15 +76745,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_arm64_standalone") {
++  source_set("qs8-qc4w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-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" ]
@@ -75908,15 +76777,27 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_arm64") {
++  source_set("qs8-qc8w-dwconv_arm64") {
 +    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-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" ]
@@ -75937,15 +76818,27 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# 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-dwconv_arm64_standalone") {
 +    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-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" ]
@@ -75969,15 +76862,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_arm64") {
++  source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -75998,15 +76893,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# 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-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -76030,15 +76927,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_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-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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76059,15 +76966,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# 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-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-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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76091,14 +77008,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_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-vprelu/gen/qs8-vprelu-scalar-u8.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76119,14 +77037,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vprelu_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-vprelu/gen/qs8-vprelu-scalar-u8.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76150,14 +77069,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_arm64") {
++  source_set("qs8-qc8w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76178,14 +77103,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vpreluc_arm64_standalone") {
++  source_set("qs8-qc8w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76209,14 +77140,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_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-vrpreluc/gen/qs8-vrpreluc-scalar-u8.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76237,14 +77171,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vrpreluc_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-vrpreluc/gen/qs8-vrpreluc-scalar-u8.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76268,19 +77205,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_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/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-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" ]
@@ -76301,19 +77244,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_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/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-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" ]
@@ -76337,15 +77286,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_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/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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76366,15 +77315,15 @@ Index: chromium-150.0.7871.46/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_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/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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76398,19 +77347,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qs8-qc8w-igemm_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = 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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76431,19 +77381,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("qs8-qc8w-igemm_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = 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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76467,20 +77418,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_arm64") {
++  source_set("qs8-qu8-packw_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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76501,20 +77446,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_arm64_standalone") {
++  source_set("qs8-qu8-packw_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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76538,89 +77477,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  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-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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-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-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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qu8-igemm_arm64") {
++  source_set("qs8-rdsum_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-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" ]
@@ -76641,20 +77506,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_arm64_standalone") {
++  source_set("qs8-rdsum_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-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" ]
@@ -76678,16 +77538,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_arm64") {
++  source_set("qs8-rsum_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-rsum/gen/qs8-rsum-neondot-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76708,16 +77566,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_arm64_standalone") {
++  source_set("qs8-rsum_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-rsum/gen/qs8-rsum-neondot-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76741,15 +77597,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_arm64") {
++  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-neon-u32-acc2.c",
++    "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76770,15 +77626,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_arm64_standalone") {
++  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-neon-u32-acc2.c",
++    "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76802,17 +77658,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_arm64") {
++  source_set("qs8-vadd_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-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" ]
@@ -76833,17 +77689,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_arm64_standalone") {
++  source_set("qs8-vadd_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-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" ]
@@ -76867,17 +77723,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_arm64") {
++  source_set("qs8-vaddc_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-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" ]
@@ -76898,17 +77754,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_arm64_standalone") {
++  source_set("qs8-vaddc_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-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" ]
@@ -76932,15 +77788,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_arm64") {
++  source_set("qs8-vcvt_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/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
++    "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76961,15 +77817,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_arm64_standalone") {
++  source_set("qs8-vcvt_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/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
++    "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76993,15 +77849,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_arm64") {
++  source_set("qs8-vlrelu_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/qs8-vlrelu/gen/qs8-vlrelu-neon-u32.c",
++    "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77022,15 +77878,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_arm64_standalone") {
++  source_set("qs8-vlrelu_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/qs8-vlrelu/gen/qs8-vlrelu-neon-u32.c",
++    "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77054,15 +77910,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_arm64") {
++  source_set("qs8-vmul_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
-+    "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
++    "src/src/qs8-vmul/gen/qs8-vmul-minmax-rndnu-neon-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77083,15 +77939,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_arm64_standalone") {
++  source_set("qs8-vmul_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
-+    "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
++    "src/src/qs8-vmul/gen/qs8-vmul-minmax-rndnu-neon-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77115,15 +77971,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_arm64") {
++  source_set("qs8-vmulc_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/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c",
++    "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-rndnu-neon-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77144,15 +78000,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_arm64_standalone") {
++  source_set("qs8-vmulc_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/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c",
++    "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-rndnu-neon-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77176,14 +78032,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_arm64") {
++  source_set("qs8-vprelu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77204,14 +78060,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_arm64_standalone") {
++  source_set("qs8-vprelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77235,14 +78091,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_arm64") {
++  source_set("qs8-vpreluc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77263,14 +78119,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vpreluc_arm64_standalone") {
++  source_set("qs8-vpreluc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77294,14 +78150,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_arm64") {
++  source_set("qs8-vrpreluc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77322,14 +78178,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vrpreluc_arm64_standalone") {
++  source_set("qs8-vrpreluc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77353,16 +78209,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("reference_arm64") {
++  source_set("qu8-dwconv_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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77383,16 +78242,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("reference_arm64_standalone") {
++  source_set("qu8-dwconv_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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77416,16 +78278,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_arm64") {
++  source_set("qu8-f32-vcvt_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-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
++    "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77446,16 +78307,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_arm64_standalone") {
++  source_set("qu8-f32-vcvt_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-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
++    "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77479,15 +78339,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_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/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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77508,15 +78372,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_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/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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77540,17 +78408,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_arm64") {
++  source_set("qu8-gemm_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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77571,17 +78442,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_arm64_standalone") {
++  source_set("qu8-gemm_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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77605,19 +78479,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_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/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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77638,19 +78512,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_arm64_standalone") {
++  source_set("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/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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77674,15 +78548,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_arm64") {
++  source_set("qu8-igemm_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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77703,15 +78582,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_arm64_standalone") {
++  source_set("qu8-igemm_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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77735,43 +78619,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("subgraph_arm64") {
++  source_set("qu8-rdsum_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/fp16_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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77792,43 +78649,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("subgraph_arm64_standalone") {
++  source_set("qu8-rdsum_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/fp16_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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77852,22 +78682,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("tables_arm64") {
++  source_set("qu8-rsum_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-rsum/gen/qu8-rsum-neon-u32-acc2.c",
++    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77888,22 +78711,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("tables_arm64_standalone") {
++  source_set("qu8-rsum_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-rsum/gen/qu8-rsum-neon-u32-acc2.c",
++    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77927,16 +78743,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_arm64") {
++  source_set("qu8-vadd_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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77957,16 +78774,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_arm64_standalone") {
++  source_set("qu8-vadd_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-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77990,14 +78808,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-lut32norm_arm64") {
++  source_set("qu8-vaddc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78018,14 +78839,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-lut32norm_arm64_standalone") {
++  source_set("qu8-vaddc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78049,15 +78873,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_arm64") {
++  source_set("qu8-vcvt_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/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
++    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78078,15 +78902,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_arm64_standalone") {
++  source_set("qu8-vcvt_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/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
++    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78110,17 +78934,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_arm64") {
++  source_set("qu8-vlrelu_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/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
++    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78141,17 +78963,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_arm64_standalone") {
++  source_set("qu8-vlrelu_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/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
++    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78175,19 +78995,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_arm64") {
++  source_set("qu8-vmul_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/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
++    "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78208,19 +79024,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_arm64_standalone") {
++  source_set("qu8-vmul_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/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
++    "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78244,15 +79056,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_arm64") {
++  source_set("qu8-vmulc_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/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
++    "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78273,15 +79085,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_arm64_standalone") {
++  source_set("qu8-vmulc_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/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
++    "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78305,17 +79117,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("qu8-vprelu_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/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78336,17 +79145,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# 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("qu8-vprelu_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/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78370,15 +79176,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-packw_arm64") {
++  source_set("qu8-vpreluc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
-+    "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78399,15 +79204,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-packw_arm64_standalone") {
++  source_set("qu8-vpreluc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
-+    "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78431,15 +79235,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_arm64") {
++  source_set("qu8-vrpreluc_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/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78460,15 +79263,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_arm64_standalone") {
++  source_set("qu8-vrpreluc_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/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78492,15 +79294,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_arm64") {
++  source_set("reference_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/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78521,15 +79324,16 @@ Index: chromium-150.0.7871.46/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_arm64_standalone") {
++  source_set("reference_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/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78553,16 +79357,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x24-transposec_arm64") {
++  source_set("s8-ibilinear_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/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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78583,16 +79387,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x24-transposec_arm64_standalone") {
++  source_set("s8-ibilinear_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/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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78616,17 +79420,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("s8-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/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c",
++    "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78647,17 +79449,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# 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("s8-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/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c",
++    "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78681,24 +79481,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_arm64") {
++  source_set("s8-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-goi-neon-ld4lane-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
-+    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c",
-+    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c"
++      "src/src/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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78719,24 +79512,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_arm64_standalone") {
++  source_set("s8-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-goi-neon-ld4lane-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
-+    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c",
-+    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c"
++      "src/src/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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78760,16 +79546,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_arm64") {
++  source_set("s8-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/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78790,16 +79579,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_arm64_standalone") {
++  source_set("s8-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/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78823,15 +79615,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-unpool_arm64") {
++  source_set("s8-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/s8-vclamp/s8-vclamp-neon-u64.c",
++    "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78852,15 +79644,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-unpool_arm64_standalone") {
++  source_set("s8-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/s8-vclamp/s8-vclamp-neon-u64.c",
++    "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78884,16 +79676,43 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_arm64") {
++  source_set("subgraph_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c",
-+    "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c",
-+    "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/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/fp16_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" ]
@@ -78914,16 +79733,43 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_arm64_standalone") {
++  source_set("subgraph_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c",
-+    "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c",
-+    "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/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/fp16_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" ]
@@ -78947,15 +79793,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_arm64") {
++  source_set("tables_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/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" ]
@@ -78976,15 +79829,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_arm64_standalone") {
++  source_set("tables_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/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" ]
@@ -79008,17 +79868,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("u8-ibilinear_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/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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79039,17 +79898,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# 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("u8-ibilinear_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/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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79073,15 +79931,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-packq_arm64") {
++  source_set("u8-lut32norm_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/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79102,15 +79959,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packq_arm64_standalone") {
++  source_set("u8-lut32norm_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/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79134,17 +79990,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-packw_arm64") {
++  source_set("u8-maxpool_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
++    "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79165,17 +80019,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packw_arm64_standalone") {
++  source_set("u8-maxpool_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
++    "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79199,15 +80051,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_arm64") {
++  source_set("u8-rdminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c",
-+    "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79228,15 +80082,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_arm64_standalone") {
++  source_set("u8-rdminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c",
-+    "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79260,14 +80116,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-copy_arm64") {
++  source_set("u8-rminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79288,14 +80149,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-copy_arm64_standalone") {
++  source_set("u8-rminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79319,15 +80185,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-fill_arm64") {
++  source_set("u8-vclamp_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/u8-vclamp/u8-vclamp-neon-u64.c",
++    "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79348,15 +80214,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-fill_arm64_standalone") {
++  source_set("u8-vclamp_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/u8-vclamp/u8-vclamp-neon-u64.c",
++    "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79380,15 +80246,81 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-pad_arm64") {
++  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
++      "-march=armv8.2-a+sve+sve2"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x16-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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
++    cflags = [
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    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/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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x16-packw_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
++    "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
++    "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79409,15 +80341,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-pad_arm64_standalone") {
++  source_set("x16-packw_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/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
++    "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
++    "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79441,14 +80374,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-transposev_arm64") {
++  source_set("x16-transposec_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.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" ]
@@ -79469,14 +80403,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-transposev_arm64_standalone") {
++  source_set("x16-transposec_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.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" ]
@@ -79499,18 +80434,78 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  }
 +}
 +
++if (build_with_chromium) {
++  source_set("x16-x32-packw_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x16-x32-packw_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//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("bf16-f32-vcvt_riscv64") {
++  source_set("x24-transposec_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79531,14 +80526,16 @@ Index: chromium-150.0.7871.46/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_riscv64_standalone") {
++  source_set("x24-transposec_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79562,14 +80559,89 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("bf16-qs8-vcvt_riscv64") {
++  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
++      "-march=armv8.2-a+sve+sve2"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-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" ]
++
++    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-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/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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x32-packw_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79590,14 +80662,24 @@ Index: chromium-150.0.7871.46/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_riscv64_standalone") {
++  source_set("x32-packw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79621,16 +80703,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("bf16-rminmax_riscv64") {
++  source_set("x32-transposec_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/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
++    "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c",
++    "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79651,16 +80733,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-rminmax_riscv64_standalone") {
++  source_set("x32-transposec_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/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
++    "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c",
++    "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79684,37 +80766,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("configs_riscv64") {
++  source_set("x32-unpool_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/x32-unpool/x32-unpool-neon.c",
++    "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79735,37 +80795,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("configs_riscv64_standalone") {
++  source_set("x32-unpool_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/x32-unpool/x32-unpool-neon.c",
++    "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79789,18 +80827,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("enums_riscv64") {
++  source_set("x64-transposec_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/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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79821,18 +80857,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("enums_riscv64_standalone") {
++  source_set("x64-transposec_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/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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79856,15 +80890,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-avgpool_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("x8-lut_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/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" ]
@@ -79885,15 +80919,15 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("x8-lut_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/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" ]
@@ -79917,18 +80951,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    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/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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79949,18 +80982,17 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    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/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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79984,15 +81016,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("x8-packq_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/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
++    "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80013,15 +81045,15 @@ Index: chromium-150.0.7871.46/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_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("x8-packq_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/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
++    "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80045,14 +81077,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_riscv64") {
++  source_set("x8-packw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80073,14 +81108,17 @@ Index: chromium-150.0.7871.46/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_riscv64_standalone") {
++  source_set("x8-packw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80104,15 +81142,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("x8-transposec_arm64") {
 +    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/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" ]
@@ -80133,15 +81171,15 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("x8-transposec_arm64_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/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" ]
@@ -80165,15 +81203,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("xx-copy_arm64") {
 +    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/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80194,15 +81231,14 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("xx-copy_arm64_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/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80226,15 +81262,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("xx-fill_arm64") {
 +    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/xx-fill/xx-fill-neon-u64.c",
++    "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80255,15 +81291,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum2_arch=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-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c"
++      "src/src/xx-fill/xx-fill-neon-u64.c",
++    "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80287,15 +81323,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("xx-pad_arm64") {
 +    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/xx-pad/xx-pad-p16-neon-u16.c",
++    "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80316,15 +81352,15 @@ Index: chromium-150.0.7871.46/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=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-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c"
++      "src/src/xx-pad/xx-pad-p16-neon-u16.c",
++    "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80348,16 +81384,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("xx-transposev_arm64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
-+    "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80378,16 +81412,14 @@ Index: chromium-150.0.7871.46/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=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-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
-+    "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80410,17 +81442,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  }
 +}
 +
++}
++
++if (current_cpu == "riscv64") {
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("bf16-f32-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    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/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80441,16 +81474,14 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("bf16-f32-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    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/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80474,15 +81505,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_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-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.c"
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80503,15 +81533,14 @@ Index: chromium-150.0.7871.46/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=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-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.c"
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80535,14 +81564,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_riscv64") {
++  source_set("bf16-qu8-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80563,14 +81592,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qs8-vcvt_riscv64_standalone") {
++  source_set("bf16-qu8-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80594,14 +81623,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_riscv64") {
++  source_set("bf16-rminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80622,14 +81653,16 @@ Index: chromium-150.0.7871.46/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_riscv64_standalone") {
++  source_set("bf16-rminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80653,15 +81686,37 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("configs_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80682,15 +81737,37 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("configs_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80714,16 +81791,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("enums_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
++      "src/src/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" ]
@@ -80744,16 +81823,18 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("enums_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
++      "src/src/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" ]
@@ -80777,15 +81858,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_riscv64") {
++  source_set("f16-avgpool_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-avgpool/gen/f16-avgpool-9p-minmax-rvvfp16arith-u2v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80806,15 +81887,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_riscv64_standalone") {
++  source_set("f16-avgpool_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-avgpool/gen/f16-avgpool-9p-minmax-rvvfp16arith-u2v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80838,7 +81919,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -80846,9 +81927,10 @@ Index: chromium-150.0.7871.46/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-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" ]
@@ -80869,7 +81951,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -80877,9 +81959,10 @@ Index: chromium-150.0.7871.46/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-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" ]
@@ -80903,16 +81986,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_riscv64") {
++  source_set("f16-f32-vcvt_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-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80933,16 +82015,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_riscv64_standalone") {
++  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-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-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80966,7 +82047,66 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-f32-vcvt_riscv64") {
++    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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32-vcvt_riscv64_standalone") {
++    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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/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-rdsum2_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -80974,7 +82114,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80995,7 +82135,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81003,7 +82143,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81027,7 +82167,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81035,7 +82175,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-u2v.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81056,7 +82196,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81064,7 +82204,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-u2v.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81088,14 +82228,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_riscv64") {
++  source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81116,14 +82257,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_riscv64_standalone") {
++  source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81147,7 +82289,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81155,25 +82297,7 @@ Index: chromium-150.0.7871.46/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-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81194,7 +82318,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81202,25 +82326,7 @@ Index: chromium-150.0.7871.46/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-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81244,7 +82350,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81252,7 +82358,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c"
++      "src/src/f16-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
++    "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81273,7 +82380,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81281,7 +82388,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c"
++      "src/src/f16-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
++    "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81305,7 +82413,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcmul_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81313,7 +82421,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcmul/gen/f16-vcmul-rvvfp16arith-u2v.c"
++      "src/src/f16-igemm/gen/f16-igemm-1x4v-minmax-rvvfp16arith.c",
++    "src/src/f16-igemm/gen/f16-igemm-7x4v-minmax-rvvfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81334,7 +82443,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81342,7 +82451,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcmul/gen/f16-vcmul-rvvfp16arith-u2v.c"
++      "src/src/f16-igemm/gen/f16-igemm-1x4v-minmax-rvvfp16arith.c",
++    "src/src/f16-igemm/gen/f16-igemm-7x4v-minmax-rvvfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81366,7 +82476,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcos_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-maxpool_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81374,7 +82484,7 @@ Index: chromium-150.0.7871.46/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-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81395,7 +82505,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-maxpool_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81403,7 +82513,7 @@ Index: chromium-150.0.7871.46/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-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81427,14 +82537,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcos_riscv64") {
++  source_set("f16-qs8-vcvt_riscv64") {
 +    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" ]
@@ -81455,14 +82565,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_riscv64_standalone") {
++  source_set("f16-qs8-vcvt_riscv64_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" ]
@@ -81486,7 +82596,66 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-velu_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-qu8-vcvt_riscv64") {
++    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_riscv64_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=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81494,7 +82663,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-rvvfp16arith-rr1-p3-u2v.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81515,7 +82684,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81523,7 +82692,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-rvvfp16arith-rr1-p3-u2v.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81547,7 +82716,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vexp_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81555,7 +82724,8 @@ Index: chromium-150.0.7871.46/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-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81576,7 +82746,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81584,7 +82754,8 @@ Index: chromium-150.0.7871.46/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-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81608,14 +82779,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vexp_riscv64") {
++  source_set("f16-rdminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-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" ]
@@ -81636,14 +82808,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_riscv64_standalone") {
++  source_set("f16-rdminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-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" ]
@@ -81667,7 +82840,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81675,7 +82848,9 @@ Index: chromium-150.0.7871.46/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-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" ]
@@ -81696,7 +82871,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -81704,7 +82879,773 @@ Index: chromium-150.0.7871.46/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-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: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",
++      "//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_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/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-spmm_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-spmm/gen/f16-spmm-8vx1-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" ]
++
++    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-spmm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-spmm/gen/f16-spmm-8vx1-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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/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") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vapproxgelu_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d") {
++    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-vcmul/gen/f16-vcmul-rvvfp16arith-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-vcmul_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vcmul/gen/f16-vcmul-rvvfp16arith-u2v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-vcos_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-rational-3-2-div-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-vcos_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-rational-3-2-div-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-vcos_riscv64") {
++    cflags = [
++  
++    ]
++  
++    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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vcos_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vcos/gen/f16-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" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-velu_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-velu/gen/f16-velu-rvvfp16arith-rr1-p3-u2v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-velu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-velu/gen/f16-velu-rvvfp16arith-rr1-p3-u2v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-vexp_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vexp/gen/f16-vexp-rvvfp16arith-poly-3-u8v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-vexp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vexp/gen/f16-vexp-rvvfp16arith-poly-3-u8v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-vexp_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vexp/gen/f16-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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vexp_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vexp/gen/f16-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" ]
++    }
++  }
++}
++
++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" ]
@@ -81840,6 +83781,315 @@ Index: chromium-150.0.7871.46/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("f16-vlog_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vlog/gen/f16-vlog-rvvfp16arith-rational-1-3-div-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-vlog_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vlog/gen/f16-vlog-rvvfp16arith-rational-1-3-div-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-vlog_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vlog_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    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-vlrelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "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" ]
++
++    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-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/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") {
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-vrnd_arch=rv64gc_zvfh-abi=lp64d_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -81888,14 +84138,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vlog_riscv64") {
++  source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81932,14 +84183,15 @@ Index: chromium-150.0.7871.46/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_riscv64_standalone") {
++  source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c"
 +    ]
  
 -      sources = [
@@ -82075,7 +84327,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -82083,7 +84335,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -82170,7 +84422,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -82178,7 +84430,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -82302,7 +84554,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -82310,7 +84562,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c4v-minmax-rvvfp16arith-2x.c"
++      "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-rational-3-2-div-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -82393,7 +84645,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -82401,7 +84653,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c4v-minmax-rvvfp16arith-2x.c"
++      "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-rational-3-2-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -82471,18 +84723,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsin_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrnd/gen/f16-vrndd-rvvfp16arith-u8v.c",
-+    "src/src/f16-vrnd/gen/f16-vrndne-rvvfp16arith-u8v.c",
-+    "src/src/f16-vrnd/gen/f16-vrndu-rvvfp16arith-u8v.c",
-+    "src/src/f16-vrnd/gen/f16-vrndz-rvvfp16arith-u8v.c"
++      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -82563,18 +84811,14 @@ Index: chromium-150.0.7871.46/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_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vsin_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrnd/gen/f16-vrndd-rvvfp16arith-u8v.c",
-+    "src/src/f16-vrnd/gen/f16-vrndne-rvvfp16arith-u8v.c",
-+    "src/src/f16-vrnd/gen/f16-vrndu-rvvfp16arith-u8v.c",
-+    "src/src/f16-vrnd/gen/f16-vrndz-rvvfp16arith-u8v.c"
++      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -82617,7 +84861,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-rdsum_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -82625,7 +84869,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c"
 +    ]
  
 -      sources = [
@@ -82729,7 +84973,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -82737,7 +84981,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -82837,15 +85081,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsqrt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -82921,15 +85164,14 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vsqrt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -83048,7 +85290,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vtanh_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -83056,7 +85298,7 @@ Index: chromium-150.0.7871.46/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-vtanh/gen/f16-vtanh-rvvfp16arith-rational-5-4-div-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -83173,7 +85415,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vtanh_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -83181,7 +85423,7 @@ Index: chromium-150.0.7871.46/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-vtanh/gen/f16-vtanh-rvvfp16arith-rational-5-4-div-u8v.c"
 +    ]
  
 -  # This is a target that cannot depend on //base.
@@ -83302,14 +85544,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vsin_riscv64") {
++  source_set("f16-vtanh_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -83346,14 +85588,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsin_riscv64_standalone") {
++  source_set("f16-vtanh_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -83486,7 +85728,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -83494,7 +85736,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c"
++      "src/src/f16-vunary/gen/f16-vabs-rvvfp16arith-u8v.c",
++    "src/src/f16-vunary/gen/f16-vneg-rvvfp16arith-u8v.c",
++    "src/src/f16-vunary/gen/f16-vsqr-rvvfp16arith-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -83579,7 +85823,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -83587,7 +85831,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c"
++      "src/src/f16-vunary/gen/f16-vabs-rvvfp16arith-u8v.c",
++    "src/src/f16-vunary/gen/f16-vneg-rvvfp16arith-u8v.c",
++    "src/src/f16-vunary/gen/f16-vsqr-rvvfp16arith-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -83708,14 +85954,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_riscv64") {
++  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -83796,14 +86043,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsqrt_riscv64_standalone") {
++  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
 +    ]
  
 -      sources = [
@@ -83873,15 +86121,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-argmaxpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-expm1minus-rr1-p3h2ts-div-u2v.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -83987,15 +86234,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f32-argmaxpool_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-expm1minus-rr1-p3h2ts-div-u2v.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -84111,14 +86357,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_riscv64") {
++  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -84219,14 +86466,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_riscv64_standalone") {
++  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -84291,17 +86539,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-avgpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vabs-rvvfp16arith-u8v.c",
-+    "src/src/f16-vunary/gen/f16-vneg-rvvfp16arith-u8v.c",
-+    "src/src/f16-vunary/gen/f16-vsqr-rvvfp16arith-u8v.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84338,17 +86583,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f32-avgpool_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vabs-rvvfp16arith-u8v.c",
-+    "src/src/f16-vunary/gen/f16-vneg-rvvfp16arith-u8v.c",
-+    "src/src/f16-vunary/gen/f16-vsqr-rvvfp16arith-u8v.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -84480,15 +86722,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-bf16-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -84567,15 +86808,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-bf16-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -84690,14 +86930,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_riscv64") {
++  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -84778,14 +87019,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_riscv64_standalone") {
++  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
 +    ]
  
 -      sources = [
@@ -84828,15 +87070,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vlrelu_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-conv-hwc2chw_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -      sources = [
@@ -84942,15 +87183,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-conv-hwc2chw_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -85053,14 +87293,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_riscv64") {
++  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -85118,14 +87360,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_riscv64_standalone") {
++  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
 +    ]
  
 -      sources = [
@@ -85168,14 +87412,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vmul_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_riscv64") {
++  source_set("f32-dwconv2d-chw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
 +    ]
  
 -      sources = [
@@ -85281,14 +87532,21 @@ Index: chromium-150.0.7871.46/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_riscv64_standalone") {
++  source_set("f32-dwconv2d-chw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -85391,7 +87649,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -85399,7 +87657,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -85457,7 +87722,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -85465,7 +87730,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c"
 +    ]
  
 -      sources = [
@@ -85533,14 +87805,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_riscv64") {
++  source_set("f32-dwconv_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -85623,14 +87904,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_riscv64_standalone") {
++  source_set("f32-dwconv_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
 +    ]
  
 -      sources = [
@@ -85698,16 +87988,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gcv"
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -85790,16 +88079,15 @@ Index: chromium-150.0.7871.46/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-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gcv"
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
 +    ]
  
 -      sources = [
@@ -85867,21 +88155,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_riscv64") {
++  source_set("f32-f16-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -85974,21 +88255,14 @@ Index: chromium-150.0.7871.46/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-dwconv2d-chw_riscv64_standalone") {
++  source_set("f32-f16-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      deps = [
@@ -86057,7 +88331,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/reference/unary-elementwise.cc",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -86065,14 +88339,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86109,7 +88377,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -86117,14 +88385,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -86253,23 +88515,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_riscv64") {
++  source_set("f32-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -86327,23 +88585,19 @@ Index: chromium-150.0.7871.46/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-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
 +    ]
  
 -      sources = [
@@ -86411,15 +88665,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-ibilinear-chw_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -86500,15 +88753,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f32-ibilinear-chw_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -      sources = [
@@ -86576,14 +88828,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_riscv64") {
++  source_set("f32-ibilinear_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -86666,14 +88918,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_riscv64_standalone") {
++  source_set("f32-ibilinear_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -86743,7 +88995,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -86751,8 +89003,8 @@ Index: chromium-150.0.7871.46/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-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -86837,7 +89089,7 @@ Index: chromium-150.0.7871.46/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-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -86845,8 +89097,8 @@ Index: chromium-150.0.7871.46/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-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -86918,19 +89170,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-gemm_riscv64") {
++  source_set("f32-igemm_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-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -87039,19 +89291,19 @@ Index: chromium-150.0.7871.46/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-igemm_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-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" ]
@@ -87172,14 +89424,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_riscv64") {
++  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -87260,14 +89513,15 @@ Index: chromium-150.0.7871.46/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-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -87335,14 +89589,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_riscv64") {
++  source_set("f32-maxpool_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -87417,14 +89671,14 @@ Index: chromium-150.0.7871.46/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-maxpool_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -87533,16 +89787,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("tables_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-qc4w-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-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -87652,16 +89905,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-qc4w-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-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) {
@@ -87761,19 +90013,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-igemm_riscv64") {
++  source_set("f32-qc8w-gemm_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-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -87827,19 +90075,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_riscv64_standalone") {
++  source_set("f32-qc8w-gemm_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-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -87907,7 +90151,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -87915,7 +90159,7 @@ Index: chromium-150.0.7871.46/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-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -87996,7 +90240,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -88004,7 +90248,7 @@ Index: chromium-150.0.7871.46/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-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -88072,14 +90316,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_riscv64") {
++  source_set("f32-qs8-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -88162,14 +90407,15 @@ Index: chromium-150.0.7871.46/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-qs8-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.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 = [
@@ -88239,15 +90485,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_riscv64") {
++  source_set("f32-qu8-vcvt_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-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -88332,15 +90578,15 @@ Index: chromium-150.0.7871.46/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-qu8-vcvt_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-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -88384,18 +90630,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("u8-rminmax_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_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"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
@@ -88422,10 +90657,17 @@ Index: chromium-150.0.7871.46/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-qu8-vcvt_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"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("u8-vclamp_f16c-fma-avx2") {
@@ -88451,6 +90693,14 @@ Index: chromium-150.0.7871.46/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",
@@ -88458,12 +90708,6 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("u8-vclamp_f16c-fma-avx2_standalone") {
@@ -88496,19 +90740,9 @@ Index: chromium-150.0.7871.46/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-qc8w-gemm_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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -88539,19 +90773,21 @@ Index: chromium-150.0.7871.46/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",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-qu8-vcvt_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"
 +    ]
  
 -  # This is a target that cannot depend on //base.
@@ -88590,13 +90826,12 @@ Index: chromium-150.0.7871.46/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" ]
-     }
-   }
-+}
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("u8-vclamp_sse2-no-sse3") {
@@ -88621,25 +90856,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.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) {
@@ -88671,24 +90898,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("u8-vclamp_x64") {
 -      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") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/u8-vclamp/u8-vclamp-scalar-u4.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -88696,28 +90921,17 @@ Index: chromium-150.0.7871.46/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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-vclamp/u8-vclamp-scalar-u4.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -88725,12 +90939,16 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
  
@@ -88738,16 +90956,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("u8-vclamp_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_riscv64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
 +    ]
  
 -      sources = [
@@ -88790,6 +91009,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c",
+-        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-avx2-u16-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88807,14 +91027,13 @@ Index: chromium-150.0.7871.46/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) {
@@ -88828,6 +91047,98 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c",
+-        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-avx2-u16-prfm.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//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("x16-packw_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-raddstoreexpminusmax_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-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("x16-packw_x64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-raddstoreexpminusmax_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88849,18 +91160,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_riscv64_standalone") {
-+    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"
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("x16-transposec_f16c-fma-avx2") {
@@ -88886,14 +91189,6 @@ Index: chromium-150.0.7871.46/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",
@@ -88901,6 +91196,11 @@ Index: chromium-150.0.7871.46/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("x16-transposec_f16c-fma-avx2_standalone") {
@@ -88932,8 +91232,6 @@ Index: chromium-150.0.7871.46/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" ]
      }
@@ -88964,7 +91262,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -88972,7 +91270,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -89030,7 +91329,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -89038,7 +91337,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -89081,15 +91381,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x16-transposec_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_riscv64") {
++  source_set("f32-rdminmax_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-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -89146,15 +91446,15 @@ Index: chromium-150.0.7871.46/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-qu8-vcvt_riscv64_standalone") {
++  source_set("f32-rdminmax_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-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      deps = [
@@ -89237,7 +91537,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -89245,7 +91545,7 @@ Index: chromium-150.0.7871.46/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-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -89303,7 +91603,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -89311,7 +91611,7 @@ Index: chromium-150.0.7871.46/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-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -89354,14 +91654,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x24-transposec_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_riscv64") {
++  source_set("f32-rdsum2_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -89475,14 +91775,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_riscv64_standalone") {
++  source_set("f32-rdsum2_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -89492,13 +91792,6 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -89520,6 +91813,13 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -89534,7 +91834,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x32-packw_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -89542,8 +91842,7 @@ Index: chromium-150.0.7871.46/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-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -89651,7 +91950,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -89659,8 +91958,7 @@ Index: chromium-150.0.7871.46/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-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -89713,15 +92011,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x32-packw_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_riscv64") {
++  source_set("f32-rdsum_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-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -89832,15 +92129,14 @@ Index: chromium-150.0.7871.46/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-rdsum_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-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -89928,7 +92224,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -89936,7 +92232,9 @@ Index: chromium-150.0.7871.46/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-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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89973,7 +92271,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -89981,7 +92279,9 @@ Index: chromium-150.0.7871.46/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-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 = [
@@ -90093,14 +92393,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/x32-unpool/x32-unpool-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_riscv64") {
++  source_set("f32-rminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90137,14 +92439,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_riscv64_standalone") {
++  source_set("f32-rminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.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 = [
@@ -90275,7 +92579,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -90283,7 +92587,7 @@ Index: chromium-150.0.7871.46/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-rsum2/gen/f32-rsum2-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -90341,7 +92645,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -90349,7 +92653,7 @@ Index: chromium-150.0.7871.46/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-rsum2/gen/f32-rsum2-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -90417,14 +92721,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_riscv64") {
++  source_set("f32-rsum2_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -90530,14 +92834,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_riscv64_standalone") {
++  source_set("f32-rsum2_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -90664,7 +92968,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -90672,9 +92976,7 @@ Index: chromium-150.0.7871.46/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-rsum/gen/f32-rsum-rvv-u4v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -90769,7 +93071,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -90777,9 +93079,7 @@ Index: chromium-150.0.7871.46/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-rsum/gen/f32-rsum-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -90822,16 +93122,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x8-lut_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_riscv64") {
++  source_set("f32-rsum_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-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
@@ -90887,16 +93185,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_riscv64_standalone") {
++  source_set("f32-rsum_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-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      deps = [
@@ -90958,7 +93254,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x8-packw_x64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-spmm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -90966,13 +93262,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.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"
 +    ]
-+
-+    configs -= [ "//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",
@@ -90993,15 +93286,20 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -91012,7 +93310,7 @@ Index: chromium-150.0.7871.46/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-spmm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91020,7 +93318,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.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 = [
@@ -91152,14 +93452,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_riscv64") {
++  source_set("f32-spmm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -91217,14 +93519,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_riscv64_standalone") {
++  source_set("f32-spmm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.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 = [
@@ -91267,7 +93571,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x8-transposec_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vapproxgelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91275,7 +93579,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
 -      sources = [
@@ -91331,7 +93635,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vapproxgelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91339,7 +93643,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
 -      deps = [
@@ -91421,14 +93725,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum_riscv64") {
++  source_set("f32-vapproxgelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -91486,14 +93790,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_riscv64_standalone") {
++  source_set("f32-vapproxgelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -91561,7 +93865,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-spmm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91569,9 +93873,25 @@ Index: chromium-150.0.7871.46/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-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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -91652,7 +93972,7 @@ Index: chromium-150.0.7871.46/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-vbinary_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91660,9 +93980,25 @@ Index: chromium-150.0.7871.46/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-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 = [
@@ -91705,16 +94041,32 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("xx-pad_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-spmm_riscv64") {
++  source_set("f32-vbinary_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-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 = [
@@ -91740,52 +94092,78 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("xx-transposev_x64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("xx-transposev_x64") {
--      cflags = []
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_riscv64_standalone") {
++  source_set("f32-vbinary_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-vbinary/gen/f32-vadd-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.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",
@@ -91793,27 +94171,64 @@ Index: chromium-150.0.7871.46/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("xx-transposev_x64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
-+}
+ }
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("xx-transposev_x64_standalone") {
+-if (current_cpu == "arm64") {
+-  if (build_with_chromium) {
+-    source_set("bf16-f32-vcvt_arm64") {
 -      cflags = []
+-
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vclamp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91821,12 +94236,32 @@ Index: chromium-150.0.7871.46/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-vclamp/gen/f32-vclamp-rvv-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("bf16-f32-vcvt_arm64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.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" ]
@@ -91847,29 +94282,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
- }
++}
  
--if (current_cpu == "arm64") {
 -  if (build_with_chromium) {
--    source_set("bf16-f32-vcvt_arm64") {
+-    source_set("bf16-qs8-vcvt_arm64") {
 -      cflags = []
 +# 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-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91877,13 +94299,12 @@ Index: chromium-150.0.7871.46/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-vclamp/gen/f32-vclamp-rvv-u8v.c"
 +    ]
  
 -      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/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -91918,23 +94339,22 @@ Index: chromium-150.0.7871.46/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("bf16-qs8-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_riscv64") {
++  source_set("f32-vclamp_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      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/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -91962,7 +94382,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("bf16-qs8-vcvt_arm64") {
+-    source_set("bf16-qu8-vcvt_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -91973,7 +94393,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -91985,14 +94405,14 @@ Index: chromium-150.0.7871.46/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_riscv64_standalone") {
++  source_set("f32-vclamp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      deps = [
@@ -92018,13 +94438,13 @@ Index: chromium-150.0.7871.46/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("bf16-qu8-vcvt_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92076,7 +94496,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -92084,25 +94504,7 @@ Index: chromium-150.0.7871.46/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-vcmul/gen/f32-vcmul-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -92161,7 +94563,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-vcmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -92169,25 +94571,7 @@ Index: chromium-150.0.7871.46/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-vcmul/gen/f32-vcmul-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -92326,32 +94710,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_riscv64") {
++  source_set("f32-vcmul_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-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -92409,32 +94775,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_riscv64_standalone") {
++  source_set("f32-vcmul_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-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -92477,7 +94825,7 @@ Index: chromium-150.0.7871.46/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-vclamp_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -92485,7 +94833,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.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 = [
@@ -92541,7 +94891,7 @@ Index: chromium-150.0.7871.46/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-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -92549,7 +94899,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.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 = [
@@ -92631,14 +94983,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_riscv64") {
++  source_set("f32-vcopysign_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.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" ]
@@ -92695,14 +95049,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_riscv64_standalone") {
++  source_set("f32-vcopysign_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.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 = [
@@ -92801,7 +95157,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vcos_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -92809,7 +95165,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
++      "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -92865,7 +95221,7 @@ Index: chromium-150.0.7871.46/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-vcos_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -92873,7 +95229,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
++      "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -92916,14 +95272,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_riscv64") {
++  source_set("f32-vcos_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -92979,14 +95335,14 @@ Index: chromium-150.0.7871.46/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-vcos_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      deps = [
@@ -93065,7 +95421,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-velu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93073,9 +95429,7 @@ Index: chromium-150.0.7871.46/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-velu/gen/f32-velu-rvv-rr2-p6-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -93129,7 +95483,7 @@ Index: chromium-150.0.7871.46/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-velu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93137,9 +95491,7 @@ Index: chromium-150.0.7871.46/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-velu/gen/f32-velu-rvv-rr2-p6-u4v.c"
 +    ]
  
 -      sources = [
@@ -93207,16 +95559,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_riscv64") {
++  source_set("f32-velu_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-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -93293,16 +95643,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_riscv64_standalone") {
++  source_set("f32-velu_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-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -93356,7 +95704,7 @@ Index: chromium-150.0.7871.46/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-vcos_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vexp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93364,7 +95712,7 @@ Index: chromium-150.0.7871.46/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-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -93417,7 +95765,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcos_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vexp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93425,7 +95773,7 @@ Index: chromium-150.0.7871.46/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-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -93468,14 +95816,14 @@ Index: chromium-150.0.7871.46/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-vcos_riscv64") {
++  source_set("f32-vexp_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -93531,14 +95879,14 @@ Index: chromium-150.0.7871.46/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_riscv64_standalone") {
++  source_set("f32-vexp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
 -      deps = [
@@ -93620,7 +95968,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-velu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vgelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93628,7 +95976,7 @@ Index: chromium-150.0.7871.46/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-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -93685,7 +96033,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vgelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93693,7 +96041,7 @@ Index: chromium-150.0.7871.46/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-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -93744,29 +96092,22 @@ Index: chromium-150.0.7871.46/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-velu_riscv64") {
++  source_set("f32-vgelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
-+
+ 
+-      asmflags = cflags
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      asmflags = cflags
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-igemm/f16-igemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
@@ -93795,6 +96136,13 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -93804,14 +96152,14 @@ Index: chromium-150.0.7871.46/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-velu_riscv64_standalone") {
++  source_set("f32-vgelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -93854,7 +96202,7 @@ Index: chromium-150.0.7871.46/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-vexp_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93862,7 +96210,7 @@ Index: chromium-150.0.7871.46/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-vhswish/gen/f32-vhswish-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -93918,7 +96266,7 @@ Index: chromium-150.0.7871.46/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-vhswish_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93926,7 +96274,7 @@ Index: chromium-150.0.7871.46/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-vhswish/gen/f32-vhswish-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -94005,14 +96353,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vexp_riscv64") {
++  source_set("f32-vhswish_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -94066,14 +96414,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vexp_riscv64_standalone") {
++  source_set("f32-vhswish_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
  
 -      sources = [
@@ -94116,7 +96464,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f16-qu8-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vlog_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94124,7 +96472,7 @@ Index: chromium-150.0.7871.46/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-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -94180,7 +96528,7 @@ Index: chromium-150.0.7871.46/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-vlog_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94188,7 +96536,7 @@ Index: chromium-150.0.7871.46/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-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c"
 +    ]
  
 -      deps = [
@@ -94268,14 +96616,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_riscv64") {
++  source_set("f32-vlog_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -94330,14 +96678,14 @@ Index: chromium-150.0.7871.46/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-vlog_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
  
 -      sources = [
@@ -94381,7 +96729,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f16-rdminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94389,7 +96737,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -94448,7 +96796,7 @@ Index: chromium-150.0.7871.46/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-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94456,7 +96804,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -94539,14 +96887,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_riscv64") {
++  source_set("f32-vlrelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -94602,14 +96950,14 @@ Index: chromium-150.0.7871.46/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-vlrelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -94652,7 +97000,7 @@ Index: chromium-150.0.7871.46/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-vlog_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vmulcaddc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94660,7 +97008,7 @@ Index: chromium-150.0.7871.46/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-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
 +    ]
  
 -      sources = [
@@ -94716,7 +97064,7 @@ Index: chromium-150.0.7871.46/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-vmulcaddc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94724,7 +97072,7 @@ Index: chromium-150.0.7871.46/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-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
 +    ]
  
 -      deps = [
@@ -94788,17 +97136,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-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",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlog_riscv64") {
++  source_set("f32-vmulcaddc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94835,19 +97184,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_riscv64_standalone") {
++  source_set("f32-vmulcaddc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-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" ]
@@ -94935,7 +97285,7 @@ Index: chromium-150.0.7871.46/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-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94943,7 +97293,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
++      "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -95020,7 +97373,7 @@ Index: chromium-150.0.7871.46/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-vrnd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95028,7 +97381,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
++      "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -95107,14 +97463,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_riscv64") {
++  source_set("f32-vrnd_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.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" ]
@@ -95168,14 +97527,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_riscv64_standalone") {
++  source_set("f32-vrnd_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.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 = [
@@ -95218,7 +97580,7 @@ Index: chromium-150.0.7871.46/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-vmulcaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95226,7 +97588,7 @@ Index: chromium-150.0.7871.46/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-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
 +    ]
  
 -      sources = [
@@ -95282,7 +97644,7 @@ Index: chromium-150.0.7871.46/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-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95290,7 +97652,7 @@ Index: chromium-150.0.7871.46/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-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
 +    ]
  
 -      deps = [
@@ -95369,14 +97731,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_riscv64") {
++  source_set("f32-vrsqrt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -95430,14 +97793,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vmulcaddc_riscv64_standalone") {
++  source_set("f32-vrsqrt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -95480,7 +97844,7 @@ Index: chromium-150.0.7871.46/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-vrnd_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vsigmoid_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95488,10 +97852,7 @@ Index: chromium-150.0.7871.46/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-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -95547,7 +97908,7 @@ Index: chromium-150.0.7871.46/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-vsigmoid_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95555,10 +97916,7 @@ Index: chromium-150.0.7871.46/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-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.c"
 +    ]
  
 -      deps = [
@@ -95637,17 +97995,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_riscv64") {
++  source_set("f32-vsigmoid_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-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -95701,17 +98056,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_riscv64_standalone") {
++  source_set("f32-vsigmoid_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-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
  
 -      sources = [
@@ -95754,7 +98106,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vgelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vsin_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95762,7 +98114,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
++      "src/src/f32-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -95818,7 +98170,7 @@ Index: chromium-150.0.7871.46/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-vsin_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95826,7 +98178,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
++      "src/src/f32-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.c"
 +    ]
  
 -      deps = [
@@ -95890,7 +98242,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vlog/gen/f16-vlog-neonfp16arith-rational-3-3-div.c",
+-        "src/src/f16-vlog/gen/f16-vlog-neonfp16arith-rational-1-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -95905,15 +98257,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_riscv64") {
++  source_set("f32-vsin_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-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -95937,7 +98288,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vlog/gen/f16-vlog-neonfp16arith-rational-3-3-div.c",
+-        "src/src/f16-vlog/gen/f16-vlog-neonfp16arith-rational-1-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -95967,20 +98318,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_riscv64_standalone") {
++  source_set("f32-vsin_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-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -96018,7 +98369,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vlog_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96026,12 +98377,13 @@ Index: chromium-150.0.7871.46/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-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-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" ]
@@ -96082,7 +98434,7 @@ Index: chromium-150.0.7871.46/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-vsqrt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96090,7 +98442,7 @@ Index: chromium-150.0.7871.46/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-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c"
 +    ]
  
 -      deps = [
@@ -96157,14 +98509,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_riscv64") {
++  source_set("f32-vsqrt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -96201,14 +98553,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_riscv64_standalone") {
++  source_set("f32-vsqrt_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-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -96283,7 +98635,7 @@ Index: chromium-150.0.7871.46/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-vsin_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vtanh_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96291,7 +98643,7 @@ Index: chromium-150.0.7871.46/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-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -96350,7 +98702,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vtanh_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96358,7 +98710,7 @@ Index: chromium-150.0.7871.46/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-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
 +    ]
  
 -      deps = [
@@ -96438,14 +98790,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsin_riscv64") {
++  source_set("f32-vtanh_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96500,14 +98852,14 @@ Index: chromium-150.0.7871.46/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-vtanh_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      sources = [
@@ -96550,7 +98902,7 @@ Index: chromium-150.0.7871.46/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-vsqrt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vunary_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96558,7 +98910,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.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 = [
@@ -96614,7 +98968,7 @@ Index: chromium-150.0.7871.46/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-vsqrt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vunary_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96622,7 +98976,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.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"
 +    ]
  
 -      deps = [
@@ -96702,14 +99058,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_riscv64") {
++  source_set("f32-vunary_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.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" ]
@@ -96764,14 +99122,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_riscv64_standalone") {
++  source_set("f32-vunary_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.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 = [
@@ -96814,15 +99174,36 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vsqrt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_arch=rv64gcv-abi=lp64d") {
++  source_set("operators_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
++      "src/src/operators/argmax-pooling-nhwc.c",
++    "src/src/operators/average-pooling-nhwc.c",
++    "src/src/operators/batch-matrix-multiply-nc.c",
++    "src/src/operators/binary-elementwise-nd.c",
++    "src/src/operators/constant-pad-nd.c",
++    "src/src/operators/convolution-nchw.c",
++    "src/src/operators/convolution-nhwc.c",
++    "src/src/operators/deconvolution-nhwc.c",
++    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
++    "src/src/operators/fully-connected-nc.c",
++    "src/src/operators/max-pooling-nhwc.c",
++    "src/src/operators/pack-lh.c",
++    "src/src/operators/reduce-nd.c",
++    "src/src/operators/resize-bilinear-nchw.c",
++    "src/src/operators/resize-bilinear-nhwc.c",
++    "src/src/operators/rope-nthc.c",
++    "src/src/operators/slice-nd.c",
++    "src/src/operators/softmax-nc.c",
++    "src/src/operators/transpose-nd.c",
++    "src/src/operators/unary-elementwise-nc.c",
++    "src/src/operators/unpooling-nhwc.c"
 +    ]
  
 -      sources = [
@@ -96866,8 +99247,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
--        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-rational-5-4-div.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -96879,15 +99259,36 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("operators_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
++      "src/src/operators/argmax-pooling-nhwc.c",
++    "src/src/operators/average-pooling-nhwc.c",
++    "src/src/operators/batch-matrix-multiply-nc.c",
++    "src/src/operators/binary-elementwise-nd.c",
++    "src/src/operators/constant-pad-nd.c",
++    "src/src/operators/convolution-nchw.c",
++    "src/src/operators/convolution-nhwc.c",
++    "src/src/operators/deconvolution-nhwc.c",
++    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
++    "src/src/operators/fully-connected-nc.c",
++    "src/src/operators/max-pooling-nhwc.c",
++    "src/src/operators/pack-lh.c",
++    "src/src/operators/reduce-nd.c",
++    "src/src/operators/resize-bilinear-nchw.c",
++    "src/src/operators/resize-bilinear-nhwc.c",
++    "src/src/operators/rope-nthc.c",
++    "src/src/operators/slice-nd.c",
++    "src/src/operators/softmax-nc.c",
++    "src/src/operators/transpose-nd.c",
++    "src/src/operators/unary-elementwise-nc.c",
++    "src/src/operators/unpooling-nhwc.c"
 +    ]
  
 -      deps = [
@@ -96919,8 +99320,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
--        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -96952,7 +99352,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.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" ]
@@ -96967,14 +99368,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_riscv64") {
++  source_set("qd8-f16-qc2w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96998,7 +99399,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.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" ]
@@ -97028,14 +99430,14 @@ Index: chromium-150.0.7871.46/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-vtanh_riscv64_standalone") {
++  source_set("qd8-f16-qc2w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -97080,17 +99482,16 @@ Index: chromium-150.0.7871.46/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-vunary_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gcv"
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-rvv-u8v.c",
-+    "src/src/f32-vunary/gen/f32-vneg-rvv-u8v.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-rvv-u8v.c"
++      "src/src/qd8-f16-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 = [
@@ -97149,17 +99550,16 @@ Index: chromium-150.0.7871.46/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-vunary_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gcv"
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-rvv-u8v.c",
-+    "src/src/f32-vunary/gen/f32-vneg-rvv-u8v.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-rvv-u8v.c"
++      "src/src/qd8-f16-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 = [
@@ -97240,16 +99640,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vunary_riscv64") {
++  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/qd8-f16-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" ]
@@ -97304,16 +99704,16 @@ Index: chromium-150.0.7871.46/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-vunary_riscv64_standalone") {
++  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/qd8-f16-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 = [
@@ -97356,36 +99756,16 @@ Index: chromium-150.0.7871.46/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("operators_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/operators/argmax-pooling-nhwc.c",
-+    "src/src/operators/average-pooling-nhwc.c",
-+    "src/src/operators/batch-matrix-multiply-nc.c",
-+    "src/src/operators/binary-elementwise-nd.c",
-+    "src/src/operators/constant-pad-nd.c",
-+    "src/src/operators/convolution-nchw.c",
-+    "src/src/operators/convolution-nhwc.c",
-+    "src/src/operators/deconvolution-nhwc.c",
-+    "src/src/operators/dynamic-fully-connected-nc.c",
-+    "src/src/operators/fingerprint_cache.c",
-+    "src/src/operators/fingerprint_id.c",
-+    "src/src/operators/fully-connected-nc.c",
-+    "src/src/operators/max-pooling-nhwc.c",
-+    "src/src/operators/pack-lh.c",
-+    "src/src/operators/reduce-nd.c",
-+    "src/src/operators/resize-bilinear-nchw.c",
-+    "src/src/operators/resize-bilinear-nhwc.c",
-+    "src/src/operators/rope-nthc.c",
-+    "src/src/operators/slice-nd.c",
-+    "src/src/operators/softmax-nc.c",
-+    "src/src/operators/transpose-nd.c",
-+    "src/src/operators/unary-elementwise-nc.c",
-+    "src/src/operators/unpooling-nhwc.c"
++      "src/src/qd8-f16-qc8w-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 = [
@@ -97442,36 +99822,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("operators_riscv64_standalone") {
++  source_set("qd8-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/operators/argmax-pooling-nhwc.c",
-+    "src/src/operators/average-pooling-nhwc.c",
-+    "src/src/operators/batch-matrix-multiply-nc.c",
-+    "src/src/operators/binary-elementwise-nd.c",
-+    "src/src/operators/constant-pad-nd.c",
-+    "src/src/operators/convolution-nchw.c",
-+    "src/src/operators/convolution-nhwc.c",
-+    "src/src/operators/deconvolution-nhwc.c",
-+    "src/src/operators/dynamic-fully-connected-nc.c",
-+    "src/src/operators/fingerprint_cache.c",
-+    "src/src/operators/fingerprint_id.c",
-+    "src/src/operators/fully-connected-nc.c",
-+    "src/src/operators/max-pooling-nhwc.c",
-+    "src/src/operators/pack-lh.c",
-+    "src/src/operators/reduce-nd.c",
-+    "src/src/operators/resize-bilinear-nchw.c",
-+    "src/src/operators/resize-bilinear-nhwc.c",
-+    "src/src/operators/rope-nthc.c",
-+    "src/src/operators/slice-nd.c",
-+    "src/src/operators/softmax-nc.c",
-+    "src/src/operators/transpose-nd.c",
-+    "src/src/operators/unary-elementwise-nc.c",
-+    "src/src/operators/unpooling-nhwc.c"
++      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x2v-minmax-rvvfp16arith.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-7x2v-minmax-rvvfp16arith.c"
 +    ]
  
 -      deps = [
@@ -97553,14 +99913,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_riscv64") {
++  source_set("qd8-f32-qb4w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -97616,14 +99977,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc2w-gemm_riscv64_standalone") {
++  source_set("qd8-f32-qb4w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -97725,16 +100087,14 @@ Index: chromium-150.0.7871.46/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("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("qd8-f32-qc2w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x2v-minmax-rvvfp16arith.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-7x2v-minmax-rvvfp16arith.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      asmflags = cflags
@@ -97770,16 +100130,14 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc2w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x2v-minmax-rvvfp16arith.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-7x2v-minmax-rvvfp16arith.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -97870,16 +100228,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x2v-minmax-rvvfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-7x2v-minmax-rvvfp16arith.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -97950,16 +100308,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x2v-minmax-rvvfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-7x2v-minmax-rvvfp16arith.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -98004,16 +100362,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-f16-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("qd8-f32-qc4w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x2v-minmax-rvvfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-7x2v-minmax-rvvfp16arith.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -98100,16 +100457,15 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc4w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x2v-minmax-rvvfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-7x2v-minmax-rvvfp16arith.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -98219,15 +100575,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_riscv64") {
++  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -98297,15 +100654,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_riscv64_standalone") {
++  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -98350,14 +100708,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-ibilinear-chw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_riscv64") {
++  source_set("qd8-f32-qc8w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -98417,14 +100777,16 @@ Index: chromium-150.0.7871.46/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-qc2w-gemm_riscv64_standalone") {
++  source_set("qd8-f32-qc8w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      deps = [
@@ -98488,7 +100850,7 @@ Index: chromium-150.0.7871.46/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-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98496,8 +100858,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      asmflags = cflags
@@ -98560,7 +100922,7 @@ Index: chromium-150.0.7871.46/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-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98568,8 +100930,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -98674,15 +101036,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-igemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_riscv64") {
++  source_set("qd8-f32-qc8w-igemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -98755,15 +101118,16 @@ Index: chromium-150.0.7871.46/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-qc8w-igemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
 +    ]
  
 -      deps = [
@@ -98849,7 +101213,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98857,8 +101221,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -98920,7 +101284,7 @@ Index: chromium-150.0.7871.46/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-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98928,8 +101292,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -98974,24 +101338,32 @@ Index: chromium-150.0.7871.46/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-qc8w-gemm_riscv64") {
++  source_set("qs8-dwconv_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "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"
 +    ]
- 
--      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",
@@ -99017,13 +101389,6 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -99033,16 +101398,17 @@ Index: chromium-150.0.7871.46/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_riscv64_standalone") {
++  source_set("qs8-dwconv_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "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 = [
@@ -99144,7 +101510,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99152,8 +101518,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -99210,7 +101575,7 @@ Index: chromium-150.0.7871.46/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("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -99218,8 +101583,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -99303,16 +101667,14 @@ Index: chromium-150.0.7871.46/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-qc8w-igemm_riscv64") {
++  source_set("qs8-f32-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -99349,16 +101711,14 @@ Index: chromium-150.0.7871.46/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_riscv64_standalone") {
++  source_set("qs8-f32-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -99434,16 +101794,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-rdminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-packw_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
  
 -      sources = [
@@ -99503,16 +101864,17 @@ Index: chromium-150.0.7871.46/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-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-packw_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/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
  
 -      deps = [
@@ -99581,17 +101943,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_riscv64") {
++  source_set("qs8-qc2w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "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" ]
@@ -99628,17 +101990,17 @@ Index: chromium-150.0.7871.46/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-qc2w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-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 = [
@@ -99716,15 +102078,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-rminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc4w-gemm_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-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 = [
@@ -99786,15 +102148,15 @@ Index: chromium-150.0.7871.46/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-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc4w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.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"
 +    ]
  
 -      deps = [
@@ -99875,14 +102237,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_riscv64") {
++  source_set("qs8-qc8w-dwconv_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-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -99937,14 +102302,17 @@ Index: chromium-150.0.7871.46/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-qc8w-dwconv_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-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 = [
@@ -100034,17 +102402,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-packw_riscv64") {
++  source_set("qs8-qc8w-dwconv_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-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" ]
@@ -100081,17 +102451,19 @@ Index: chromium-150.0.7871.46/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-qc8w-dwconv_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-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 = [
@@ -100201,17 +102573,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vbinary_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_riscv64") {
++  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/qs8-qc8w-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 = [
@@ -100305,17 +102676,16 @@ Index: chromium-150.0.7871.46/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-qc2w-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-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/qs8-qc8w-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 = [
@@ -100384,15 +102754,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_riscv64") {
++  source_set("qs8-qc8w-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-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" ]
@@ -100429,15 +102799,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_riscv64_standalone") {
++  source_set("qs8-qc8w-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-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 = [
@@ -100515,7 +102885,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vcopysign_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100523,9 +102893,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qs8-qc8w-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 = [
@@ -100587,7 +102956,7 @@ Index: chromium-150.0.7871.46/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100595,9 +102964,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qs8-qc8w-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 = [
@@ -100680,19 +103048,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_riscv64") {
++  source_set("qs8-qc8w-igemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "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" ]
@@ -100749,19 +103113,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_riscv64_standalone") {
++  source_set("qs8-qc8w-igemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "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 = [
@@ -100805,16 +103165,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vexp_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qu8-packw_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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -      sources = [
@@ -100872,16 +103230,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qu8-packw_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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -      deps = [
@@ -100962,15 +103318,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_riscv64") {
++  source_set("qs8-rdsum_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-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -101025,15 +103381,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_riscv64_standalone") {
++  source_set("qs8-rdsum_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-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -101077,16 +103433,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vlog_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-rdsum_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-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      sources = [
@@ -101144,16 +103498,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-rdsum_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-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      deps = [
@@ -101223,15 +103575,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-neonfma-2x.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_riscv64") {
++  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -101268,15 +103620,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_riscv64_standalone") {
++  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -101361,14 +103713,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vrnd_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_riscv64") {
++  source_set("qs8-rsum_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -101437,14 +103789,14 @@ Index: chromium-150.0.7871.46/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-qu8-packw_riscv64_standalone") {
++  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -101527,7 +103879,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -101535,7 +103887,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -101591,7 +103943,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -101599,7 +103951,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -101643,14 +103995,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vsin_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_riscv64") {
++  source_set("qs8-vadd_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -101708,14 +104061,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_riscv64_standalone") {
++  source_set("qs8-vadd_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -101796,7 +104150,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -101804,7 +104158,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -101859,7 +104213,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -101867,7 +104221,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -101988,14 +104342,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_riscv64") {
++  source_set("qs8-vaddc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -102071,14 +104426,15 @@ Index: chromium-150.0.7871.46/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-rsum_riscv64_standalone") {
++  source_set("qs8-vaddc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -102148,7 +104504,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102156,7 +104512,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -102205,7 +104561,7 @@ Index: chromium-150.0.7871.46/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-vadd_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102213,7 +104569,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -102291,15 +104647,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("pf32-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_riscv64") {
++  source_set("qs8-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -102359,15 +104714,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_riscv64_standalone") {
++  source_set("qs8-vcvt_riscv64_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-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -102448,7 +104802,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102456,7 +104810,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -102511,7 +104865,7 @@ Index: chromium-150.0.7871.46/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-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102519,7 +104873,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -102564,15 +104918,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_riscv64") {
++  source_set("qs8-vlrelu_riscv64") {
 +    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-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
@@ -102631,15 +104984,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_riscv64_standalone") {
++  source_set("qs8-vlrelu_riscv64_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-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      deps = [
@@ -102720,7 +105072,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102728,7 +105080,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -102783,7 +105135,7 @@ Index: chromium-150.0.7871.46/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("qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102791,7 +105143,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -102835,14 +105187,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_riscv64") {
++  source_set("qs8-vmul_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -102900,14 +105252,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_riscv64_standalone") {
++  source_set("qs8-vmul_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -102989,7 +105341,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102997,7 +105349,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -103053,7 +105405,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -103061,7 +105413,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -103104,14 +105456,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc2w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_riscv64") {
++  source_set("qs8-vmulc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -103158,14 +105510,14 @@ Index: chromium-150.0.7871.46/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-vlrelu_riscv64_standalone") {
++  source_set("qs8-vmulc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -103209,15 +105561,14 @@ Index: chromium-150.0.7871.46/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-vmul_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vprelu_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-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -103275,15 +105626,14 @@ Index: chromium-150.0.7871.46/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-vprelu_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-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      deps = [
@@ -103352,14 +105702,14 @@ Index: chromium-150.0.7871.46/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-vmul_riscv64") {
++  source_set("qs8-vpreluc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -103396,14 +105746,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_riscv64_standalone") {
++  source_set("qs8-vpreluc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -103479,15 +105829,14 @@ Index: chromium-150.0.7871.46/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-vmulc_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vrpreluc_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-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -103547,15 +105896,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vrpreluc_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-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      deps = [
@@ -103618,14 +105966,16 @@ Index: chromium-150.0.7871.46/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-vmulc_riscv64") {
++  source_set("qu8-dwconv_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/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      asmflags = cflags
@@ -103662,14 +106012,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_riscv64_standalone") {
++  source_set("qu8-dwconv_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/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -103732,84 +106084,33 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "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",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qs8-vprelu_riscv64") {
-+    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" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vprelu_riscv64_standalone") {
++if (build_with_chromium) {
++  source_set("qu8-dwconv_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
--      sources = [
--        "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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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" ]
@@ -103817,22 +106118,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16") {
--      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
 -      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-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" ]
@@ -103844,30 +106144,35 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    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+dotprod+fp16_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16") {
 -      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
-+if (build_with_chromium) {
-+  source_set("qs8-vpreluc_riscv64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-dwconv_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -103887,60 +106192,6 @@ Index: chromium-150.0.7871.46/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" ]
--      }
--    }
--  }
-+    configs -= [ "//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-qc8w-igemm_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-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",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_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-vpreluc_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
-+    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -103960,14 +106211,16 @@ Index: chromium-150.0.7871.46/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_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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",
+-        "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" ]
@@ -103994,61 +106247,36 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    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-vrpreluc_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.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" ]
- 
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
+-
 -      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-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",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_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_riscv64_standalone") {
++if (build_with_chromium) {
++  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -104061,22 +106289,19 @@ Index: chromium-150.0.7871.46/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") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
--      asmflags = cflags
-+    public_configs = [ ":xnnpack_public_config" ]
- 
 -      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-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" ]
@@ -104096,58 +106321,86 @@ Index: chromium-150.0.7871.46/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("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qd8-f16-qc8w-igemm_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-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-rvv-u2v.c"
++    ]
+ 
 -      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-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" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-f32-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_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_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-      asmflags = cflags
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -104157,8 +106410,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      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-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" ]
@@ -104184,26 +106437,24 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-f32-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
 -        "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-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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -104238,26 +106489,25 @@ Index: chromium-150.0.7871.46/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") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_riscv64") {
++  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
 -        "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-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" ]
@@ -104285,8 +106535,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -104296,8 +106546,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      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-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",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -104309,17 +106559,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_riscv64_standalone") {
++  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -104345,14 +106594,14 @@ Index: chromium-150.0.7871.46/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") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-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-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" ]
@@ -104379,41 +106628,94 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qb4w-gemm_arm64") {
--      cflags = []
+-    source_set("qd8-f32-qb4w-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-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-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",
 -      ]
--
++if (build_with_chromium) {
++  source_set("qu8-gemm_riscv64") {
++    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"
++    ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//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-f32-vcvt_arch=rv64gcv-abi=lp64d") {
++    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-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
+-      sources = [
+-        "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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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" ]
@@ -104421,15 +106723,59 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qb4w-gemm_arm64_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qb4w-gemm_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_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_arm64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  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-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -104458,16 +106804,39 @@ Index: chromium-150.0.7871.46/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("qd8-f32-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/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",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -104475,24 +106844,24 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
--      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",
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -104500,41 +106869,96 @@ Index: chromium-150.0.7871.46/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("qd8-f32-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/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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-  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",
+-      ]
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_riscv64") {
++  source_set("qu8-igemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.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" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_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_arm64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      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-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -104555,40 +106979,30 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qc2w-gemm_arm64") {
--      cflags = []
+-    source_set("qd8-f32-qc4w-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-f32-vcvt_riscv64_standalone") {
++  source_set("qu8-igemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -104623,10 +107037,10 @@ Index: chromium-150.0.7871.46/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_arm64_standalone") {
--      cflags = []
+-    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -104634,13 +107048,13 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.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" ]
@@ -104668,8 +107082,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -104679,8 +107093,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c",
+-        "src/src/qd8-f32-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",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -104692,7 +107106,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -104700,8 +107114,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    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-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -104727,104 +107140,9 @@ Index: chromium-150.0.7871.46/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") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-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" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//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_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",
--      ]
-+if (build_with_chromium) {
-+  source_set("qu8-gemm_riscv64") {
-+    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"
-+    ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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_arch=armv8.2-a+i8mm+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -104849,23 +107167,16 @@ Index: chromium-150.0.7871.46/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("qd8-f32-qc4w-gemm_arm64") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16-minmax-neon-mlal-lane.c",
@@ -104885,30 +107196,34 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("qu8-rdsum_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.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("qd8-f32-qc4w-gemm_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  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-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x1v-minmax-fp32-rvv.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -104937,18 +107252,6 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -104958,16 +107261,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-rdsum_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -      sources = [
@@ -105045,15 +107346,15 @@ Index: chromium-150.0.7871.46/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-igemm_riscv64") {
++  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
 +    ]
  
 -      asmflags = cflags
@@ -105090,15 +107391,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_riscv64_standalone") {
++  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -105162,15 +107463,14 @@ Index: chromium-150.0.7871.46/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-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-rsum_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -105207,15 +107507,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-rsum_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -105294,14 +107593,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_riscv64") {
++  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -105354,14 +107654,15 @@ Index: chromium-150.0.7871.46/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-rdsum_riscv64_standalone") {
++  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -105439,15 +107740,15 @@ Index: chromium-150.0.7871.46/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-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vadd_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      asmflags = cflags
@@ -105484,15 +107785,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vadd_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -105556,14 +107857,15 @@ Index: chromium-150.0.7871.46/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-rsum_riscv64") {
++  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -105600,14 +107902,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_riscv64_standalone") {
++  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -105688,15 +107991,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-igemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vaddc_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -105762,15 +108065,15 @@ Index: chromium-150.0.7871.46/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-vaddc_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-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -105851,15 +108154,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_riscv64") {
++  source_set("qu8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -105913,15 +108216,15 @@ Index: chromium-150.0.7871.46/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-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -105966,15 +108269,14 @@ Index: chromium-150.0.7871.46/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-vaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vcvt_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-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -106032,15 +108334,14 @@ Index: chromium-150.0.7871.46/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-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -106104,7 +108405,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      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",
 -      ]
 -
@@ -106120,15 +108423,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_riscv64") {
++  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -106152,7 +108455,9 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      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",
 -      ]
 -
@@ -106183,15 +108488,15 @@ Index: chromium-150.0.7871.46/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-vaddc_riscv64_standalone") {
++  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -106236,15 +108541,14 @@ Index: chromium-150.0.7871.46/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-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vlrelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-rvv-u4v.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
@@ -106302,15 +108606,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vlrelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-rvv-u4v.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      deps = [
@@ -106372,15 +108675,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    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-vcvt_riscv64") {
++  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -106401,20 +108710,15 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -106425,14 +108729,15 @@ Index: chromium-150.0.7871.46/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("qu8-vcvt_riscv64_standalone") {
++  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -106513,15 +108818,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-dwconv_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vmul_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -106583,15 +108887,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vmul_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -106659,14 +108962,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_riscv64") {
++  source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -106703,14 +109007,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_riscv64_standalone") {
++  source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -106786,15 +109091,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-packw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vmulc_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -106854,15 +109158,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vmulc_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -106945,14 +109248,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_riscv64") {
++  source_set("qu8-vprelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107011,14 +109314,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_riscv64_standalone") {
++  source_set("qu8-vprelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -107062,23 +109365,29 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    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("qu8-vmulc_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vpreluc_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
- 
--      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-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
@@ -107103,13 +109412,6 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -107119,15 +109421,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vpreluc_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -107197,14 +109498,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_riscv64") {
++  source_set("qu8-vrpreluc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -107263,14 +109564,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_riscv64_standalone") {
++  source_set("qu8-vrpreluc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -107358,14 +109659,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_riscv64") {
++  source_set("reference_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
  
 -      sources = [
@@ -107442,14 +109745,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_riscv64_standalone") {
++  source_set("reference_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107521,14 +109826,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c8-minmax-fp32-neoni8mm.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_riscv64") {
++  source_set("s8-ibilinear_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -107565,14 +109870,14 @@ Index: chromium-150.0.7871.46/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-vpreluc_riscv64_standalone") {
++  source_set("s8-ibilinear_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -107682,14 +109987,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_riscv64") {
++  source_set("s8-maxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -107766,14 +110072,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vrpreluc_riscv64_standalone") {
++  source_set("s8-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -107833,16 +110140,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      asmflags = cflags
 +if (build_with_chromium) {
-+  source_set("reference_riscv64") {
++  source_set("s8-maxpool_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -107908,16 +110213,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("reference_riscv64_standalone") {
++  source_set("s8-maxpool_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      deps = [
@@ -108003,14 +110306,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_riscv64") {
++  source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -108070,14 +110375,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_riscv64_standalone") {
++  source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -108120,15 +110427,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qu8-packw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("s8-rdminmax_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -108185,15 +110492,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("s8-rdminmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      deps = [
@@ -108273,14 +110580,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_riscv64") {
++  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-rminmax/gen/s8-rmax-rvv-u8v.c",
++    "src/src/s8-rminmax/gen/s8-rmin-rvv-u8v.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-rvv-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -108334,14 +110644,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_riscv64_standalone") {
++  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-rminmax/gen/s8-rmax-rvv-u8v.c",
++    "src/src/s8-rminmax/gen/s8-rmin-rvv-u8v.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -108411,16 +110724,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("s8-rminmax_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-rvv-u8v.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-rvv-u8v.c"
++      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -108469,16 +110782,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("s8-rminmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-rvv-u8v.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-rvv-u8v.c"
++      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -108556,15 +110869,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vaddc_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_riscv64") {
++  source_set("s8-vclamp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
++      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -108624,15 +110937,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_riscv64_standalone") {
++  source_set("s8-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
++      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -108713,17 +111026,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("s8-vclamp_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-rvv-u8v.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-rvv-u8v.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-rvv-u8v.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -108778,17 +111088,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("s8-vclamp_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-rvv-u8v.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-rvv-u8v.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-rvv-u8v.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -108832,16 +111139,43 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vmul_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_riscv64") {
++  source_set("subgraph_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/subgraph/argmax-pooling-2d.c",
++    "src/src/subgraph/average-pooling-2d.c",
++    "src/src/subgraph/batch-matrix-multiply.c",
++    "src/src/subgraph/binary.c",
++    "src/src/subgraph/concatenate.c",
++    "src/src/subgraph/convolution-2d.c",
++    "src/src/subgraph/copy.c",
++    "src/src/subgraph/deconvolution-2d.c",
++    "src/src/subgraph/deprecated.c",
++    "src/src/subgraph/depth-to-space-2d.c",
++    "src/src/subgraph/depthwise-convolution-2d.c",
++    "src/src/subgraph/even-split.c",
++    "src/src/subgraph/fully-connected-sparse.c",
++    "src/src/subgraph/fully-connected.c",
++    "src/src/subgraph/max-pooling-2d.c",
++    "src/src/subgraph/pack-lh.c",
++    "src/src/subgraph/reshape-helpers.c",
++    "src/src/subgraph/rewrites/fp16_to_fp32.cc",
++    "src/src/subgraph/rope.c",
++    "src/src/subgraph/softmax.c",
++    "src/src/subgraph/space-to-depth-2d.c",
++    "src/src/subgraph/static-constant-pad.c",
++    "src/src/subgraph/static-reduce.c",
++    "src/src/subgraph/static-resize-bilinear-2d.c",
++    "src/src/subgraph/static-slice.c",
++    "src/src/subgraph/static-transpose.c",
++    "src/src/subgraph/subgraph-utils.c",
++    "src/src/subgraph/unary.c",
++    "src/src/subgraph/unpooling-2d.c",
++    "src/src/subgraph/validation.c"
 +    ]
  
 -      sources = [
@@ -108899,16 +111233,43 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_riscv64_standalone") {
++  source_set("subgraph_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/subgraph/argmax-pooling-2d.c",
++    "src/src/subgraph/average-pooling-2d.c",
++    "src/src/subgraph/batch-matrix-multiply.c",
++    "src/src/subgraph/binary.c",
++    "src/src/subgraph/concatenate.c",
++    "src/src/subgraph/convolution-2d.c",
++    "src/src/subgraph/copy.c",
++    "src/src/subgraph/deconvolution-2d.c",
++    "src/src/subgraph/deprecated.c",
++    "src/src/subgraph/depth-to-space-2d.c",
++    "src/src/subgraph/depthwise-convolution-2d.c",
++    "src/src/subgraph/even-split.c",
++    "src/src/subgraph/fully-connected-sparse.c",
++    "src/src/subgraph/fully-connected.c",
++    "src/src/subgraph/max-pooling-2d.c",
++    "src/src/subgraph/pack-lh.c",
++    "src/src/subgraph/reshape-helpers.c",
++    "src/src/subgraph/rewrites/fp16_to_fp32.cc",
++    "src/src/subgraph/rope.c",
++    "src/src/subgraph/softmax.c",
++    "src/src/subgraph/space-to-depth-2d.c",
++    "src/src/subgraph/static-constant-pad.c",
++    "src/src/subgraph/static-reduce.c",
++    "src/src/subgraph/static-resize-bilinear-2d.c",
++    "src/src/subgraph/static-slice.c",
++    "src/src/subgraph/static-transpose.c",
++    "src/src/subgraph/subgraph-utils.c",
++    "src/src/subgraph/unary.c",
++    "src/src/subgraph/unpooling-2d.c",
++    "src/src/subgraph/validation.c"
 +    ]
  
 -      deps = [
@@ -108988,15 +111349,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_arch=rv64gcv-abi=lp64d") {
++  source_set("tables_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
++      "src/src/tables/exp2-k-over-2048.c",
++    "src/src/tables/exp2-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-16.c",
++    "src/src/tables/exp2minus-k-over-2048.c",
++    "src/src/tables/exp2minus-k-over-32.c",
++    "src/src/tables/exp2minus-k-over-4.c",
++    "src/src/tables/exp2minus-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-8.c",
++    "src/src/tables/vlog.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -109050,15 +111418,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("tables_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
++      "src/src/tables/exp2-k-over-2048.c",
++    "src/src/tables/exp2-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-16.c",
++    "src/src/tables/exp2minus-k-over-2048.c",
++    "src/src/tables/exp2minus-k-over-32.c",
++    "src/src/tables/exp2minus-k-over-4.c",
++    "src/src/tables/exp2minus-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-8.c",
++    "src/src/tables/vlog.c"
 +    ]
  
 -      sources = [
@@ -109101,14 +111476,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vpreluc_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_riscv64") {
++  source_set("u8-ibilinear_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -109164,14 +111539,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_riscv64_standalone") {
++  source_set("u8-ibilinear_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -      deps = [
@@ -109255,43 +111630,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("subgraph_riscv64") {
++  source_set("u8-lut32norm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/rewrites/fp16_to_fp32.cc",
-+    "src/src/subgraph/rope.c",
-+    "src/src/subgraph/softmax.c",
-+    "src/src/subgraph/space-to-depth-2d.c",
-+    "src/src/subgraph/static-constant-pad.c",
-+    "src/src/subgraph/static-reduce.c",
-+    "src/src/subgraph/static-resize-bilinear-2d.c",
-+    "src/src/subgraph/static-slice.c",
-+    "src/src/subgraph/static-transpose.c",
-+    "src/src/subgraph/subgraph-utils.c",
-+    "src/src/subgraph/unary.c",
-+    "src/src/subgraph/unpooling-2d.c",
-+    "src/src/subgraph/validation.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -109350,43 +111696,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("subgraph_riscv64_standalone") {
++  source_set("u8-lut32norm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/rewrites/fp16_to_fp32.cc",
-+    "src/src/subgraph/rope.c",
-+    "src/src/subgraph/softmax.c",
-+    "src/src/subgraph/space-to-depth-2d.c",
-+    "src/src/subgraph/static-constant-pad.c",
-+    "src/src/subgraph/static-reduce.c",
-+    "src/src/subgraph/static-resize-bilinear-2d.c",
-+    "src/src/subgraph/static-slice.c",
-+    "src/src/subgraph/static-transpose.c",
-+    "src/src/subgraph/subgraph-utils.c",
-+    "src/src/subgraph/unary.c",
-+    "src/src/subgraph/unpooling-2d.c",
-+    "src/src/subgraph/validation.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
 -      sources = [
@@ -109430,22 +111747,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-f32-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("tables_riscv64") {
++  source_set("u8-maxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/tables/exp2-k-over-2048.c",
-+    "src/src/tables/exp2-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-16.c",
-+    "src/src/tables/exp2minus-k-over-2048.c",
-+    "src/src/tables/exp2minus-k-over-32.c",
-+    "src/src/tables/exp2minus-k-over-4.c",
-+    "src/src/tables/exp2minus-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-8.c",
-+    "src/src/tables/vlog.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -109487,30 +111797,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      asmflags = cflags
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
- 
--      asmflags = cflags
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("tables_riscv64_standalone") {
++  source_set("u8-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/tables/exp2-k-over-2048.c",
-+    "src/src/tables/exp2-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-16.c",
-+    "src/src/tables/exp2minus-k-over-2048.c",
-+    "src/src/tables/exp2minus-k-over-32.c",
-+    "src/src/tables/exp2minus-k-over-4.c",
-+    "src/src/tables/exp2minus-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-8.c",
-+    "src/src/tables/vlog.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -109556,14 +111859,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_riscv64") {
++  source_set("u8-maxpool_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109614,14 +111917,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_riscv64_standalone") {
++  source_set("u8-maxpool_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -109705,14 +112008,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("u8-lut32norm_riscv64") {
++  source_set("u8-rdminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      asmflags = cflags
@@ -109751,14 +112056,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-lut32norm_riscv64_standalone") {
++  source_set("u8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -109841,15 +112148,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("u8-rdminmax_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -109909,15 +112216,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("u8-rdminmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -109962,14 +112269,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-rdsum_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_riscv64") {
++  source_set("u8-rminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/u8-rminmax/gen/u8-rmax-rvv-u8v.c",
++    "src/src/u8-rminmax/gen/u8-rmin-rvv-u8v.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -110028,14 +112338,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_riscv64_standalone") {
++  source_set("u8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/u8-rminmax/gen/u8-rmax-rvv-u8v.c",
++    "src/src/u8-rminmax/gen/u8-rmin-rvv-u8v.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-rvv-u8v.c"
 +    ]
  
 -      deps = [
@@ -110118,16 +112431,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("u8-rminmax_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-rvv-u8v.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-rvv-u8v.c"
++      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -110184,16 +112497,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("u8-rminmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-rvv-u8v.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-rvv-u8v.c"
++      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -110289,15 +112602,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_riscv64") {
++  source_set("u8-vclamp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -110352,15 +112665,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_riscv64_standalone") {
++  source_set("u8-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -110404,17 +112717,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vlrelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("u8-vclamp_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-rvv-u8v.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-rvv-u8v.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-rvv-u8v.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -110472,17 +112782,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("u8-vclamp_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-rvv-u8v.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-rvv-u8v.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-rvv-u8v.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -110563,16 +112870,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_riscv64") {
++  source_set("x16-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -110627,16 +112932,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_riscv64_standalone") {
++  source_set("x16-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c"
 +    ]
  
 -      sources = [
@@ -110679,15 +112982,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vprelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_arch=rv64gcv-abi=lp64d") {
++  source_set("x16-transposec_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -110743,15 +113045,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("x16-transposec_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
  
 -      deps = [
@@ -110830,14 +113131,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_riscv64") {
++  source_set("x16-x32-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
++    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -110891,14 +113193,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_riscv64_standalone") {
++  source_set("x16-x32-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
++    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
 +    ]
  
 -      sources = [
@@ -110943,14 +113246,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("reference_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x16-transposec_riscv64") {
++  source_set("x24-transposec_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
  
 -      sources = [
@@ -111010,14 +113313,14 @@ Index: chromium-150.0.7871.46/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("x16-transposec_riscv64_standalone") {
++  source_set("x24-transposec_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
  
 -      deps = [
@@ -111099,15 +113402,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_riscv64") {
++  source_set("x32-packw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
-+    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
++      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -111162,15 +113465,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-x32-packw_riscv64_standalone") {
++  source_set("x32-packw_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
-+    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
++      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
 +    ]
  
 -      sources = [
@@ -111270,14 +113573,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x24-transposec_riscv64") {
++  source_set("x32-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-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-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -111336,14 +113644,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x24-transposec_riscv64_standalone") {
++  source_set("x32-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-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-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"
 +    ]
  
 -      sources = [
@@ -111413,7 +113726,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x32-packw_arch=rv64gcv-abi=lp64d") {
++  source_set("x32-transposec_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -111421,7 +113734,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
++      "src/src/x32-transposec/gen/x32-transposec-16x8-rvv.c",
++    "src/src/x32-transposec/gen/x32-transposec-32x8-rvv.c",
++    "src/src/x32-transposec/gen/x32-transposec-4x4-rvv.c",
++    "src/src/x32-transposec/gen/x32-transposec-8x8-rvv.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -111496,7 +113812,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("x32-transposec_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -111504,7 +113820,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
++      "src/src/x32-transposec/gen/x32-transposec-16x8-rvv.c",
++    "src/src/x32-transposec/gen/x32-transposec-32x8-rvv.c",
++    "src/src/x32-transposec/gen/x32-transposec-4x4-rvv.c",
++    "src/src/x32-transposec/gen/x32-transposec-8x8-rvv.c"
 +    ]
  
 -      sources = [
@@ -111613,19 +113932,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("tables_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x32-packw_riscv64") {
++  source_set("x32-transposec_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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-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-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -111691,19 +114005,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_riscv64_standalone") {
++  source_set("x32-transposec_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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-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-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
  
 -      deps = [
@@ -111784,18 +114093,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x32-transposec_arch=rv64gcv-abi=lp64d") {
++  source_set("x32-unpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-16x8-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-32x8-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-4x4-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-8x8-rvv.c"
++      "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -111849,18 +114154,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("x32-unpool_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-16x8-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-32x8-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-4x4-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-8x8-rvv.c"
++      "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
  
 -      sources = [
@@ -111930,14 +114231,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x32-transposec_riscv64") {
++  source_set("x64-transposec_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -111986,14 +114287,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_riscv64_standalone") {
++  source_set("x64-transposec_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -112073,14 +114374,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("u8-rminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x32-unpool_riscv64") {
++  source_set("x8-lut_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -112142,14 +114443,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-unpool_riscv64_standalone") {
++  source_set("x8-lut_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -112232,14 +114533,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x64-transposec_riscv64") {
++  source_set("x8-packq_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -112296,19 +114597,20 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_riscv64_standalone") {
++  source_set("x8-packq_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
+-        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 -        "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112347,19 +114649,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x16-packw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x8-lut_riscv64") {
++  source_set("x8-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
+-        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 -        "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c",
 -      ]
 -
@@ -112412,14 +114718,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_riscv64_standalone") {
++  source_set("x8-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
 +    ]
  
 -      deps = [
@@ -112500,14 +114809,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x8-packq_riscv64") {
++  source_set("x8-transposec_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -112562,14 +114871,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packq_riscv64_standalone") {
++  source_set("x8-transposec_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -112641,17 +114950,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x8-packw_riscv64") {
++  source_set("xx-copy_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -112700,17 +115006,14 @@ Index: chromium-150.0.7871.46/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("x8-packw_riscv64_standalone") {
++  source_set("xx-copy_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
  
 -      sources = [
@@ -112795,14 +115098,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x32-packw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x8-transposec_riscv64") {
++  source_set("xx-fill_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
  
 -      sources = [
@@ -112859,14 +115162,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_riscv64_standalone") {
++  source_set("xx-fill_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
  
 -      sources = [
@@ -112911,14 +115214,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x32-transposec_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("xx-copy_riscv64") {
++  source_set("xx-pad_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
  
 -      sources = [
@@ -112967,14 +115270,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-copy_riscv64_standalone") {
++  source_set("xx-pad_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
  
 -      sources = [
@@ -113018,14 +115321,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x32-unpool_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("xx-fill_riscv64") {
++  source_set("xx-transposev_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
  
 -      sources = [
@@ -113084,14 +115387,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-fill_riscv64_standalone") {
++  source_set("xx-transposev_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
  
 -      deps = [
@@ -113154,21 +115457,23 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_chromium) {
 -    source_set("x8-lut_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",
 -      ]
++if (current_cpu == "ppc64") {
 +if (build_with_chromium) {
-+  source_set("xx-pad_riscv64") {
++  source_set("bf16-f32-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113205,14 +115510,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-pad_riscv64_standalone") {
++  source_set("bf16-f32-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -113288,14 +115593,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +if (build_with_chromium) {
-+  source_set("xx-transposev_riscv64") {
++  source_set("bf16-qs8-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      sources = [
@@ -113355,14 +115660,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-transposev_riscv64_standalone") {
++  source_set("bf16-qs8-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      deps = [
@@ -113424,8 +115729,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_chromium) {
 -    source_set("x8-packw_arm64") {
 -      cflags = []
-+}
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
@@ -113445,16 +115749,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (current_cpu == "ppc64") {
 +if (build_with_chromium) {
-+  source_set("bf16-f32-vcvt_ppc64") {
++  source_set("bf16-qu8-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
++      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -113511,14 +115814,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-f32-vcvt_ppc64_standalone") {
++  source_set("bf16-qu8-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
++      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      sources = [
@@ -113562,14 +115865,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x8-transposec_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("bf16-qs8-vcvt_ppc64") {
++  source_set("bf16-rminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -113626,14 +115931,16 @@ Index: chromium-150.0.7871.46/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("bf16-qs8-vcvt_ppc64_standalone") {
++  source_set("bf16-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      deps = [
@@ -113713,16 +116020,37 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("bf16-rminmax_ppc64") {
++  source_set("configs_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
++      "src/src/configs/argmaxpool-config.c",
++    "src/src/configs/avgpool-config.c",
++    "src/src/configs/binary-elementwise-config.c",
++    "src/src/configs/cmul-config.c",
++    "src/src/configs/conv-hwc2chw-config.c",
++    "src/src/configs/dwconv-config.c",
++    "src/src/configs/dwconv2d-chw-config.c",
++    "src/src/configs/gemm-config.c",
++    "src/src/configs/hardware-config.c",
++    "src/src/configs/ibilinear-chw-config.c",
++    "src/src/configs/ibilinear-config.c",
++    "src/src/configs/lut32norm-config.c",
++    "src/src/configs/maxpool-config.c",
++    "src/src/configs/pack-lh-config.c",
++    "src/src/configs/raddstoreexpminusmax-config.c",
++    "src/src/configs/reduce-config.c",
++    "src/src/configs/spmm-config.c",
++    "src/src/configs/transpose-config.c",
++    "src/src/configs/unary-elementwise-config.c",
++    "src/src/configs/unpool-config.c",
++    "src/src/configs/vmulcaddc-config.c",
++    "src/src/configs/x8-lut-config.c",
++    "src/src/configs/xx-fill-config.c",
++    "src/src/configs/xx-pad-config.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -113777,16 +116105,37 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-rminmax_ppc64_standalone") {
++  source_set("configs_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
++      "src/src/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 = [
@@ -113830,37 +116179,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("xx-pad_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("configs_ppc64") {
++  source_set("enums_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/configs/argmaxpool-config.c",
-+    "src/src/configs/avgpool-config.c",
-+    "src/src/configs/binary-elementwise-config.c",
-+    "src/src/configs/cmul-config.c",
-+    "src/src/configs/conv-hwc2chw-config.c",
-+    "src/src/configs/dwconv-config.c",
-+    "src/src/configs/dwconv2d-chw-config.c",
-+    "src/src/configs/gemm-config.c",
-+    "src/src/configs/hardware-config.c",
-+    "src/src/configs/ibilinear-chw-config.c",
-+    "src/src/configs/ibilinear-config.c",
-+    "src/src/configs/lut32norm-config.c",
-+    "src/src/configs/maxpool-config.c",
-+    "src/src/configs/pack-lh-config.c",
-+    "src/src/configs/raddstoreexpminusmax-config.c",
-+    "src/src/configs/reduce-config.c",
-+    "src/src/configs/spmm-config.c",
-+    "src/src/configs/transpose-config.c",
-+    "src/src/configs/unary-elementwise-config.c",
-+    "src/src/configs/unpool-config.c",
-+    "src/src/configs/vmulcaddc-config.c",
-+    "src/src/configs/x8-lut-config.c",
-+    "src/src/configs/xx-fill-config.c",
-+    "src/src/configs/xx-pad-config.c"
++      "src/src/enums/allocation-type.c",
++    "src/src/enums/datatype-strings.c",
++    "src/src/enums/microkernel-type.c",
++    "src/src/enums/node-type.c",
++    "src/src/enums/operator-type.c"
 +    ]
  
 -      sources = [
@@ -113917,37 +116247,18 @@ Index: chromium-150.0.7871.46/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("configs_ppc64_standalone") {
++  source_set("enums_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/configs/argmaxpool-config.c",
-+    "src/src/configs/avgpool-config.c",
-+    "src/src/configs/binary-elementwise-config.c",
-+    "src/src/configs/cmul-config.c",
-+    "src/src/configs/conv-hwc2chw-config.c",
-+    "src/src/configs/dwconv-config.c",
-+    "src/src/configs/dwconv2d-chw-config.c",
-+    "src/src/configs/gemm-config.c",
-+    "src/src/configs/hardware-config.c",
-+    "src/src/configs/ibilinear-chw-config.c",
-+    "src/src/configs/ibilinear-config.c",
-+    "src/src/configs/lut32norm-config.c",
-+    "src/src/configs/maxpool-config.c",
-+    "src/src/configs/pack-lh-config.c",
-+    "src/src/configs/raddstoreexpminusmax-config.c",
-+    "src/src/configs/reduce-config.c",
-+    "src/src/configs/spmm-config.c",
-+    "src/src/configs/transpose-config.c",
-+    "src/src/configs/unary-elementwise-config.c",
-+    "src/src/configs/unpool-config.c",
-+    "src/src/configs/vmulcaddc-config.c",
-+    "src/src/configs/x8-lut-config.c",
-+    "src/src/configs/xx-fill-config.c",
-+    "src/src/configs/xx-pad-config.c"
++      "src/src/enums/allocation-type.c",
++    "src/src/enums/datatype-strings.c",
++    "src/src/enums/microkernel-type.c",
++    "src/src/enums/node-type.c",
++    "src/src/enums/operator-type.c"
 +    ]
  
 -      deps = [
@@ -114027,18 +116338,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("enums_ppc64") {
++  source_set("f16-f32-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/enums/allocation-type.c",
-+    "src/src/enums/datatype-strings.c",
-+    "src/src/enums/microkernel-type.c",
-+    "src/src/enums/node-type.c",
-+    "src/src/enums/operator-type.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -114092,18 +116399,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("enums_ppc64_standalone") {
++  source_set("f16-f32-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/enums/allocation-type.c",
-+    "src/src/enums/datatype-strings.c",
-+    "src/src/enums/microkernel-type.c",
-+    "src/src/enums/node-type.c",
-+    "src/src/enums/operator-type.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -114146,14 +116449,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("bf16-qs8-vcvt_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_ppc64") {
++  source_set("f16-qs8-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      sources = [
@@ -114186,7 +116489,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("bf16-rminmax_riscv64") {
+-    source_set("bf16-qu8-vcvt_riscv64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -114197,9 +116500,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
+-        "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -114211,14 +116512,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_ppc64_standalone") {
++  source_set("f16-qs8-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      deps = [
@@ -114244,12 +116545,44 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("bf16-rminmax_riscv64_standalone") {
+-    source_set("bf16-qu8-vcvt_riscv64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
+-        "src/src/bf16-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 (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("bf16-rminmax_riscv64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
 -        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
 -        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
 -        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
@@ -114264,6 +116597,179 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-qu8-vcvt_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("bf16-rminmax_riscv64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("configs_riscv64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-qu8-vcvt_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/configs/argmaxpool-config.c",
+-        "src/src/configs/avgpool-config.c",
+-        "src/src/configs/binary-elementwise-config.c",
+-        "src/src/configs/cmul-config.c",
+-        "src/src/configs/conv-hwc2chw-config.c",
+-        "src/src/configs/dwconv-config.c",
+-        "src/src/configs/dwconv2d-chw-config.c",
+-        "src/src/configs/gemm-config.c",
+-        "src/src/configs/hardware-config.c",
+-        "src/src/configs/ibilinear-chw-config.c",
+-        "src/src/configs/ibilinear-config.c",
+-        "src/src/configs/lut32norm-config.c",
+-        "src/src/configs/maxpool-config.c",
+-        "src/src/configs/pack-lh-config.c",
+-        "src/src/configs/raddstoreexpminusmax-config.c",
+-        "src/src/configs/reduce-config.c",
+-        "src/src/configs/spmm-config.c",
+-        "src/src/configs/transpose-config.c",
+-        "src/src/configs/unary-elementwise-config.c",
+-        "src/src/configs/unpool-config.c",
+-        "src/src/configs/vmulcaddc-config.c",
+-        "src/src/configs/x8-lut-config.c",
+-        "src/src/configs/xx-fill-config.c",
+-        "src/src/configs/xx-pad-config.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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("configs_riscv64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/configs/argmaxpool-config.c",
+-        "src/src/configs/avgpool-config.c",
+-        "src/src/configs/binary-elementwise-config.c",
+-        "src/src/configs/cmul-config.c",
+-        "src/src/configs/conv-hwc2chw-config.c",
+-        "src/src/configs/dwconv-config.c",
+-        "src/src/configs/dwconv2d-chw-config.c",
+-        "src/src/configs/gemm-config.c",
+-        "src/src/configs/hardware-config.c",
+-        "src/src/configs/ibilinear-chw-config.c",
+-        "src/src/configs/ibilinear-config.c",
+-        "src/src/configs/lut32norm-config.c",
+-        "src/src/configs/maxpool-config.c",
+-        "src/src/configs/pack-lh-config.c",
+-        "src/src/configs/raddstoreexpminusmax-config.c",
+-        "src/src/configs/reduce-config.c",
+-        "src/src/configs/spmm-config.c",
+-        "src/src/configs/transpose-config.c",
+-        "src/src/configs/unary-elementwise-config.c",
+-        "src/src/configs/unpool-config.c",
+-        "src/src/configs/vmulcaddc-config.c",
+-        "src/src/configs/x8-lut-config.c",
+-        "src/src/configs/xx-fill-config.c",
+-        "src/src/configs/xx-pad-config.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
 -        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
 -
@@ -114279,50 +116785,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("configs_riscv64") {
+-    source_set("enums_riscv64") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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" ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/configs/argmaxpool-config.c",
--        "src/src/configs/avgpool-config.c",
--        "src/src/configs/binary-elementwise-config.c",
--        "src/src/configs/cmul-config.c",
--        "src/src/configs/conv-hwc2chw-config.c",
--        "src/src/configs/dwconv-config.c",
--        "src/src/configs/dwconv2d-chw-config.c",
--        "src/src/configs/gemm-config.c",
--        "src/src/configs/hardware-config.c",
--        "src/src/configs/ibilinear-chw-config.c",
--        "src/src/configs/ibilinear-config.c",
--        "src/src/configs/lut32norm-config.c",
--        "src/src/configs/maxpool-config.c",
--        "src/src/configs/pack-lh-config.c",
--        "src/src/configs/raddstoreexpminusmax-config.c",
--        "src/src/configs/reduce-config.c",
--        "src/src/configs/spmm-config.c",
--        "src/src/configs/transpose-config.c",
--        "src/src/configs/unary-elementwise-config.c",
--        "src/src/configs/unpool-config.c",
--        "src/src/configs/vmulcaddc-config.c",
--        "src/src/configs/x8-lut-config.c",
--        "src/src/configs/xx-fill-config.c",
--        "src/src/configs/xx-pad-config.c",
+-        "src/src/enums/allocation-type.c",
+-        "src/src/enums/datatype-strings.c",
+-        "src/src/enums/microkernel-type.c",
+-        "src/src/enums/node-type.c",
+-        "src/src/enums/operator-type.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114336,80 +116808,19 @@ Index: chromium-150.0.7871.46/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("configs_riscv64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-qs8-vcvt_ppc64_standalone") {
++if (build_with_chromium) {
++  source_set("f16-rdminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.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/configs/argmaxpool-config.c",
--        "src/src/configs/avgpool-config.c",
--        "src/src/configs/binary-elementwise-config.c",
--        "src/src/configs/cmul-config.c",
--        "src/src/configs/conv-hwc2chw-config.c",
--        "src/src/configs/dwconv-config.c",
--        "src/src/configs/dwconv2d-chw-config.c",
--        "src/src/configs/gemm-config.c",
--        "src/src/configs/hardware-config.c",
--        "src/src/configs/ibilinear-chw-config.c",
--        "src/src/configs/ibilinear-config.c",
--        "src/src/configs/lut32norm-config.c",
--        "src/src/configs/maxpool-config.c",
--        "src/src/configs/pack-lh-config.c",
--        "src/src/configs/raddstoreexpminusmax-config.c",
--        "src/src/configs/reduce-config.c",
--        "src/src/configs/spmm-config.c",
--        "src/src/configs/transpose-config.c",
--        "src/src/configs/unary-elementwise-config.c",
--        "src/src/configs/unpool-config.c",
--        "src/src/configs/vmulcaddc-config.c",
--        "src/src/configs/x8-lut-config.c",
--        "src/src/configs/xx-fill-config.c",
--        "src/src/configs/xx-pad-config.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 -    }
 -  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114417,58 +116828,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("enums_riscv64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("enums_riscv64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/enums/allocation-type.c",
--        "src/src/enums/datatype-strings.c",
--        "src/src/enums/microkernel-type.c",
--        "src/src/enums/node-type.c",
--        "src/src/enums/operator-type.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("enums_riscv64_standalone") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -114498,11 +116866,9 @@ Index: chromium-150.0.7871.46/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("f16-avgpool_arch=rv64gc_zvfh-abi=lp64d") {
@@ -114527,18 +116893,26 @@ Index: chromium-150.0.7871.46/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-rdminmax_ppc64_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"
 +    ]
  
 -      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) {
@@ -114572,16 +116946,11 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  if (build_with_chromium) {
@@ -114610,20 +116979,14 @@ Index: chromium-150.0.7871.46/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) {
@@ -114658,13 +117021,20 @@ Index: chromium-150.0.7871.46/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-rminmax_ppc64") {
++    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"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
@@ -114689,26 +117059,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f16-rdminmax_ppc64") {
-+    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"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -114740,13 +117105,6 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -114756,15 +117114,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_ppc64_standalone") {
++  source_set("f16-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -114832,16 +117191,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_ppc64") {
++  source_set("f16-vapproxgelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -114942,16 +117299,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_ppc64_standalone") {
++  source_set("f16-vapproxgelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -115066,14 +117421,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_ppc64") {
++  source_set("f16-vcos_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -115175,14 +117530,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_ppc64_standalone") {
++  source_set("f16-vcos_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -115300,14 +117655,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vcos_ppc64") {
++  source_set("f16-vexp_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -115398,14 +117753,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_ppc64_standalone") {
++  source_set("f16-vexp_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -      deps = [
@@ -115472,14 +117827,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vexp_ppc64") {
++  source_set("f16-vgelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -115516,14 +117871,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f16-vgelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -115652,14 +118007,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_ppc64") {
++  source_set("f16-vlog_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -115718,14 +118073,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_ppc64_standalone") {
++  source_set("f16-vlog_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
 +    ]
  
 -      sources = [
@@ -115795,14 +118150,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vlog_ppc64") {
++  source_set("f16-vsin_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
++      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -115887,14 +118242,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f16-vsin_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
++      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -115938,17 +118293,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-rminmax_riscv64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f16-vsin_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
@@ -115975,93 +118320,19 @@ Index: chromium-150.0.7871.46/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-spmm_arch=rv64gc_zvfh-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-spmm/gen/f16-spmm-8vx1-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" ]
--
--      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-spmm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-spmm/gen/f16-spmm-8vx1-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" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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-vsin_ppc64_standalone") {
++if (build_with_chromium) {
++  source_set("f16-vsqrt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -116069,7 +118340,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-u2v.c",
+-        "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116095,12 +118366,12 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-    source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -116108,7 +118379,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-u2v.c",
+-        "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116128,24 +118399,17 @@ Index: chromium-150.0.7871.46/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-vapproxgelu_riscv64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f16-vsqrt_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vsqrt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
@@ -116155,31 +118419,38 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "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" ]
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "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" ]
  
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/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" ]
+     }
    }
 +}
  
@@ -116187,21 +118458,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vapproxgelu_riscv64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsqrt_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-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" ]
@@ -116223,10 +118483,16 @@ Index: chromium-150.0.7871.46/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-vtanh_ppc64") {
++    cflags = [
++  
++    ]
++  
++    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("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d") {
@@ -116269,18 +118535,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    public_configs = [ ":xnnpack_public_config" ]
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -116329,9 +118598,8 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
  
@@ -116358,21 +118626,26 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+if (build_with_chromium) {
-+  source_set("f16-vtanh_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vtanh_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-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("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -116405,10 +118678,12 @@ Index: chromium-150.0.7871.46/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" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-vcmul_arch=rv64gc_zvfh-abi=lp64d") {
@@ -116433,16 +118708,12 @@ Index: chromium-150.0.7871.46/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" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -116478,16 +118749,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_ppc64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-argmaxpool_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -116525,7 +118795,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
 -  # This is a target that cannot depend on //base.
@@ -116558,24 +118828,17 @@ Index: chromium-150.0.7871.46/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-vcos_riscv64") {
 -      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("f32-argmaxpool_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-argmaxpool_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
@@ -116585,31 +118848,38 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "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" ]
+-      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" ]
  
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/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" ]
+     }
    }
 +}
  
@@ -116617,16 +118887,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vcos_riscv64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_ppc64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-avgpool_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -116685,13 +118954,14 @@ Index: chromium-150.0.7871.46/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) {
@@ -116723,11 +118993,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-avgpool_ppc64_standalone") {
++    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-vexp_arch=rv64gc_zvfh-abi=lp64d") {
@@ -116752,25 +119030,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-avgpool_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vexp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -116801,52 +119075,41 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vexp_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-bf16-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -116854,12 +119117,16 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
  
@@ -116867,7 +119134,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vexp_riscv64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-bf16-vcvt_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c",
@@ -116892,16 +119170,10 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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" ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-vgelu_arch=rv64gc_zvfh-abi=lp64d") {
@@ -116926,21 +119198,18 @@ Index: chromium-150.0.7871.46/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-vgelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -116971,45 +119240,39 @@ Index: chromium-150.0.7871.46/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-vgelu_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-bf16-vcvt_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-conv-hwc2chw_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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"
 +    ]
  
--      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" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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",
@@ -117017,12 +119280,16 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
  
@@ -117030,7 +119297,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vgelu_riscv64_standalone") {
 -      cflags = []
--
++# 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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
@@ -117055,58 +119333,13 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+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-vhswish_arch=rv64gc_zvfh-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "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" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-  if (build_with_chromium) {
+-    source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -117126,60 +119359,15 @@ Index: chromium-150.0.7871.46/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" ]
--      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f16-vlog_riscv64") {
--      cflags = []
-+# 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"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c",
+-        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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" ]
@@ -117191,12 +119379,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vlog_riscv64_standalone") {
--      cflags = []
+-    source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c",
+-        "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117237,7 +119428,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f16-vlog_arch=rv64gc_zvfh-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -117245,7 +119436,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c",
+-        "src/src/f16-vlog/gen/f16-vlog-rvvfp16arith-rational-1-3-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117276,7 +119467,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
+-    source_set("f16-vlog_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -117284,7 +119475,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c",
+-        "src/src/f16-vlog/gen/f16-vlog-rvvfp16arith-rational-1-3-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117310,28 +119501,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "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" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-    source_set("f16-vlog_riscv64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-dwconv2d-chw_ppc64_standalone") {
@@ -117351,46 +119522,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # 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") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "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" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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",
@@ -117398,26 +119542,6 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  if (build_with_chromium) {
--    source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d") {
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -117435,18 +119559,12 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
+-    source_set("f16-vlog_riscv64_standalone") {
+-      cflags = []
 -
 -      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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117489,7 +119607,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    ]
  
 -  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",
@@ -117497,7 +119615,7 @@ Index: chromium-150.0.7871.46/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117528,7 +119646,7 @@ Index: chromium-150.0.7871.46/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=rv64gc_zvfh-abi=lp64d_standalone") {
+-    source_set("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -117536,7 +119654,7 @@ Index: chromium-150.0.7871.46/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117562,7 +119680,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  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",
@@ -117570,7 +119688,7 @@ Index: chromium-150.0.7871.46/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" ]
@@ -117584,10 +119702,6 @@ Index: chromium-150.0.7871.46/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("f32-dwconv_ppc64_standalone") {
@@ -117609,9 +119723,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-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-vsigmoid_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-    source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -117619,7 +119741,7 @@ Index: chromium-150.0.7871.46/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" ]
@@ -117641,13 +119763,15 @@ Index: chromium-150.0.7871.46/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" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  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",
@@ -117655,7 +119779,10 @@ Index: chromium-150.0.7871.46/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117669,21 +119796,18 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && 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-vsin_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-    source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -117691,7 +119815,10 @@ Index: chromium-150.0.7871.46/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117711,20 +119838,8 @@ Index: chromium-150.0.7871.46/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("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("f32-f16-vcvt_ppc64") {
 +    cflags = [
@@ -117736,21 +119851,37 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
+-  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" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -117758,16 +119889,68 @@ Index: chromium-150.0.7871.46/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("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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_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("f16-vsin_riscv64_standalone") {
--      cflags = []
+-  if (build_with_chromium) {
+-    source_set("f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-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("f32-f16-vcvt_ppc64_standalone") {
@@ -117780,9 +119963,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
+-  # 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") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117810,7 +120001,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -117818,7 +120009,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c",
+-        "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-rational-3-2-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117846,7 +120037,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-    source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -117854,7 +120045,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c",
+-        "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-rational-3-2-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117881,12 +120072,12 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vsqrt_riscv64") {
+-    source_set("f16-vsin_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
+-        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
 -      ]
 +if (build_with_chromium) {
 +  source_set("f32-gemm_ppc64") {
@@ -117934,7 +120125,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vsqrt_riscv64_standalone") {
+-    source_set("f16-vsin_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -117955,6 +120146,169 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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-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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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-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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//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-vsqrt_riscv64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
+-      ]
++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"
++    ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//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-vsqrt_riscv64_standalone") {
+-      cflags = []
++# 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"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
 -        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
 -      ]
 -
@@ -117991,7 +120345,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-expm1minus-rr1-p3h2ts-div-u2v.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-rational-5-4-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118027,7 +120381,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-expm1minus-rr1-p3h2ts-div-u2v.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-rational-5-4-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118059,17 +120413,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c",
+-        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_ppc64") {
++  source_set("f32-ibilinear_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118106,19 +120460,19 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-ibilinear_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c",
+-        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118244,14 +120598,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_ppc64") {
++  source_set("f32-igemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.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" ]
@@ -118309,14 +120668,19 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-igemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.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 = [
@@ -118384,19 +120748,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-igemm_ppc64") {
++  source_set("f32-maxpool_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"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -118487,19 +120846,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_ppc64_standalone") {
++  source_set("f32-maxpool_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-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      deps = [
@@ -118566,14 +120920,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_ppc64") {
++  source_set("f32-qc4w-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-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-4x4-minmax-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118610,14 +120965,15 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-qc4w-gemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-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-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -118729,15 +121085,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_ppc64") {
++  source_set("f32-qc8w-gemm_ppc64") {
 +    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-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118774,15 +121130,15 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-qc8w-gemm_ppc64_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-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -118891,15 +121247,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-dwconv2d-chw_riscv64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_ppc64") {
++  source_set("f32-qs8-vcvt_ppc64") {
 +    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-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -      sources = [
@@ -118949,15 +121305,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_ppc64_standalone") {
++  source_set("f32-qs8-vcvt_ppc64_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-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -      sources = [
@@ -119085,21 +121441,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-dwconv_riscv64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_ppc64") {
++  source_set("f32-qu8-vcvt_ppc64") {
 +    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-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" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -119126,15 +121477,20 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -119145,15 +121501,15 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-qu8-vcvt_ppc64_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-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -      sources = [
@@ -119274,15 +121630,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_ppc64") {
++  source_set("f32-raddstoreexpminusmax_ppc64") {
 +    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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119319,15 +121674,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_ppc64_standalone") {
++  source_set("f32-raddstoreexpminusmax_ppc64_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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      sources = [
@@ -119458,14 +121812,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_ppc64") {
++  source_set("f32-rdminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -119524,14 +121879,15 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-rdminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -119574,15 +121930,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-ibilinear-chw_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_ppc64") {
++  source_set("f32-rdsum2_ppc64") {
 +    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-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -119638,15 +121993,14 @@ Index: chromium-150.0.7871.46/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-rdminmax_ppc64_standalone") {
++  source_set("f32-rdsum2_ppc64_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      deps = [
@@ -119729,14 +122083,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_ppc64") {
++  source_set("f32-rdsum_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -119795,14 +122149,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-rdsum_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -119904,14 +122258,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_ppc64") {
++  source_set("f32-rminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -119969,14 +122325,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_ppc64_standalone") {
++  source_set("f32-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.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 = [
@@ -120019,16 +122377,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-maxpool_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_ppc64") {
++  source_set("f32-rsum2_ppc64") {
 +    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-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -120085,16 +122441,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_ppc64_standalone") {
++  source_set("f32-rsum2_ppc64_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-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -      deps = [
@@ -120163,14 +122517,14 @@ Index: chromium-150.0.7871.46/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-rsum2_ppc64") {
++  source_set("f32-rsum_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120207,14 +122561,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-rsum_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
@@ -120328,171 +122682,6 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
-+    ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-qs8-vcvt_riscv64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
-+    ]
- 
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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-qu8-vcvt_arch=rv64gcv-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gcv",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      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-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gcv",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//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-qu8-vcvt_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",
--      ]
-+if (build_with_chromium) {
 +  source_set("f32-spmm_ppc64") {
 +    cflags = [
 +  
@@ -120535,7 +122724,7 @@ Index: chromium-150.0.7871.46/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-qs8-vcvt_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -120553,8 +122742,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
--        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c",
+-        "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120582,7 +122771,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -120590,7 +122779,7 @@ Index: chromium-150.0.7871.46/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-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120618,7 +122807,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # 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-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -120626,7 +122815,7 @@ Index: chromium-150.0.7871.46/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-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120653,12 +122842,13 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-raddstoreexpminusmax_riscv64") {
+-    source_set("f32-qu8-vcvt_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c",
+-        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c",
 -      ]
 +if (build_with_chromium) {
 +  source_set("f32-vapproxgelu_ppc64") {
@@ -120701,7 +122891,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-raddstoreexpminusmax_riscv64_standalone") {
+-    source_set("f32-qu8-vcvt_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -120717,7 +122907,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c",
+-        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120745,7 +122936,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -120753,8 +122944,7 @@ Index: chromium-150.0.7871.46/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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120782,7 +122972,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -120790,8 +122980,7 @@ Index: chromium-150.0.7871.46/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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120818,13 +123007,12 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-rdminmax_riscv64") {
+-    source_set("f32-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c",
 -      ]
 +if (build_with_chromium) {
 +  source_set("f32-vbinary_ppc64") {
@@ -120885,7 +123073,7 @@ Index: chromium-150.0.7871.46/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-raddstoreexpminusmax_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -120919,6 +123107,172 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
+-        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
+-        "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
+-        "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//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-rdminmax_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",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-vclamp_ppc64") {
++    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" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//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-rdminmax_riscv64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vclamp_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++    ]
+ 
+-      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",
 -      ]
@@ -121027,14 +123381,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_ppc64") {
++  source_set("f32-vcmul_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -121071,14 +123425,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_ppc64_standalone") {
++  source_set("f32-vcmul_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -121190,14 +123544,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_ppc64") {
++  source_set("f32-vcopysign_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -121234,14 +123590,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_ppc64_standalone") {
++  source_set("f32-vcopysign_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-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 = [
@@ -121359,16 +123717,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_ppc64") {
++  source_set("f32-vcos_ppc64") {
 +    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-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -121405,16 +123761,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_ppc64_standalone") {
++  source_set("f32-vcos_ppc64_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-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -121528,14 +123882,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcos_ppc64") {
++  source_set("f32-velu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -121572,14 +123926,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-velu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      sources = [
@@ -121691,14 +124045,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-velu_ppc64") {
++  source_set("f32-vexp_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -121735,14 +124089,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-vexp_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -121860,14 +124214,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vexp_ppc64") {
++  source_set("f32-vgelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -121904,14 +124258,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vexp_ppc64_standalone") {
++  source_set("f32-vgelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -122025,14 +124379,14 @@ Index: chromium-150.0.7871.46/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-vgelu_ppc64") {
++  source_set("f32-vhswish_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -122069,14 +124423,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-vhswish_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
  
 -      sources = [
@@ -122219,14 +124573,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vbinary_riscv64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_ppc64") {
++  source_set("f32-vlog_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -122287,14 +124641,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_ppc64_standalone") {
++  source_set("f32-vlog_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
  
 -      sources = [
@@ -122424,14 +124778,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vclamp/gen/f32-vclamp-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlog_ppc64") {
++  source_set("f32-vlrelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -122468,14 +124822,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_ppc64_standalone") {
++  source_set("f32-vlrelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -122587,14 +124941,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_ppc64") {
++  source_set("f32-vmulcaddc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -122631,14 +124985,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-vmulcaddc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -      sources = [
@@ -122756,14 +125110,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_ppc64") {
++  source_set("f32-vrnd_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.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" ]
@@ -122800,14 +125157,17 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-vrnd_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.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 = [
@@ -122921,17 +125281,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_ppc64") {
++  source_set("f32-vrsqrt_ppc64") {
 +    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-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -122968,17 +125326,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_ppc64_standalone") {
++  source_set("f32-vrsqrt_ppc64_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-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -123090,15 +125446,14 @@ Index: chromium-150.0.7871.46/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-vrsqrt_ppc64") {
++  source_set("f32-vsigmoid_ppc64") {
 +    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-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -123135,15 +125490,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_ppc64_standalone") {
++  source_set("f32-vsigmoid_ppc64_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-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
  
 -      sources = [
@@ -123255,14 +125609,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_ppc64") {
++  source_set("f32-vsin_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -123299,14 +125653,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("f32-vsin_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -123418,14 +125772,14 @@ Index: chromium-150.0.7871.46/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-vsin_ppc64") {
++  source_set("f32-vsqrt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -123462,14 +125816,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_ppc64_standalone") {
++  source_set("f32-vsqrt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -123581,14 +125935,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vhswish/gen/f32-vhswish-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_ppc64") {
++  source_set("f32-vtanh_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -123625,14 +125979,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_ppc64_standalone") {
++  source_set("f32-vtanh_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      sources = [
@@ -123744,169 +126098,6 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_ppc64") {
-+    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" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vlog_riscv64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gcv",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-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",
--      ]
-+    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-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gcv",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-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 (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f32-vlrelu_riscv64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
--      ]
-+if (build_with_chromium) {
 +  source_set("f32-vunary_ppc64") {
 +    cflags = [
 +  
@@ -123949,7 +126140,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vlrelu_riscv64_standalone") {
+-    source_set("f32-vlog_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -123967,7 +126158,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
+-        "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -123995,7 +126186,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vmulcaddc_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -124003,7 +126194,7 @@ Index: chromium-150.0.7871.46/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-vlrelu/gen/f32-vlrelu-rvv-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -124031,7 +126222,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # 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-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -124039,7 +126230,7 @@ Index: chromium-150.0.7871.46/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-vlrelu/gen/f32-vlrelu-rvv-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -124066,12 +126257,12 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vmulcaddc_riscv64") {
+-    source_set("f32-vlrelu_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
 +  source_set("operators_ppc64") {
@@ -124136,7 +126327,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vmulcaddc_riscv64_standalone") {
+-    source_set("f32-vlrelu_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -124174,6 +126365,169 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vmulcaddc_arch=rv64gcv-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vmulcaddc_arch=rv64gcv-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vmulcaddc_riscv64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c",
+-      ]
++if (build_with_chromium) {
++  source_set("qd8-f16-qc2w-gemm_ppc64") {
++    cflags = [
++  
++    ]
++  
++    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",
+-      ]
++    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_riscv64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qd8-f16-qc2w-gemm_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
 -        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c",
 -      ]
 -
@@ -124282,15 +126636,21 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vrnd_riscv64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_ppc64") {
++  source_set("qd8-f32-qb4w-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
 +    ]
++
++    configs -= [ "//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",
@@ -124311,20 +126671,15 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -124335,14 +126690,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc2w-gemm_ppc64_standalone") {
++  source_set("qd8-f32-qb4w-gemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -124458,15 +126814,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_ppc64") {
++  source_set("qd8-f32-qc2w-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -124503,15 +126858,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qd8-f32-qc2w-gemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -124624,14 +126978,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_ppc64") {
++  source_set("qd8-f32-qc4w-gemm_ppc64") {
 +    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-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" ]
@@ -124668,14 +127023,15 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qd8-f32-qc4w-gemm_ppc64_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-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 = [
@@ -124787,15 +127143,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_ppc64") {
++  source_set("qd8-f32-qc8w-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-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" ]
@@ -124832,15 +127189,16 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qd8-f32-qc8w-gemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-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 = [
@@ -124952,16 +127310,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_ppc64") {
++  source_set("qd8-f32-qc8w-igemm_ppc64") {
 +    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"
++      "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" ]
@@ -124998,16 +127356,16 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qd8-f32-qc8w-igemm_ppc64_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"
++      "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 = [
@@ -125119,16 +127477,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_ppc64") {
++  source_set("qs8-dwconv_ppc64") {
 +    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"
++      "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" ]
@@ -125165,16 +127524,17 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qs8-dwconv_ppc64_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"
++      "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 = [
@@ -125292,17 +127652,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vunary/gen/f32-vsqr-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_ppc64") {
++  source_set("qs8-f32-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -125339,17 +127696,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qs8-f32-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -125445,14 +127799,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("operators_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_ppc64") {
++  source_set("qs8-packw_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
  
 -      sources = [
@@ -125521,14 +127878,17 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qs8-packw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
  
 -      sources = [
@@ -125571,17 +127931,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc2w-gemm_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-packw_ppc64") {
++  source_set("qs8-qc2w-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-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 = [
@@ -125685,17 +128045,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_ppc64_standalone") {
++  source_set("qs8-qc2w-gemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -125801,17 +128161,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_ppc64") {
++  source_set("qs8-qc4w-gemm_ppc64") {
 +    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-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" ]
@@ -125870,17 +128228,15 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qs8-qc4w-gemm_ppc64_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-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 = [
@@ -125924,15 +128280,19 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qb4w-gemm_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_ppc64") {
++  source_set("qs8-qc8w-dwconv_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -125989,15 +128349,19 @@ Index: chromium-150.0.7871.46/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-qc4w-gemm_ppc64_standalone") {
++  source_set("qs8-qc8w-dwconv_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      deps = [
@@ -126080,19 +128444,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_ppc64") {
++  source_set("qs8-qc8w-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "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" ]
@@ -126151,19 +128511,15 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qs8-qc8w-gemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "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 = [
@@ -126233,15 +128589,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_ppc64") {
++  source_set("qs8-qc8w-igemm_ppc64") {
 +    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-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) {
@@ -126324,15 +128680,15 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qs8-qc8w-igemm_ppc64_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-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 = [
@@ -126404,15 +128760,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_ppc64") {
++  source_set("qs8-qu8-packw_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -126495,15 +128850,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qs8-qu8-packw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -      sources = [
@@ -126575,14 +128929,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_ppc64") {
++  source_set("qs8-rdsum_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -126665,14 +129019,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qs8-rdsum_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      sources = [
@@ -126770,14 +129124,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_ppc64") {
++  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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -126835,14 +129189,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_ppc64_standalone") {
++  source_set("qs8-rsum_ppc64_standalone") {
 +    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 = [
@@ -126910,14 +129264,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_ppc64") {
++  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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -126966,14 +129321,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_ppc64_standalone") {
++  source_set("qs8-vadd_ppc64_standalone") {
 +    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 = [
@@ -127051,15 +129407,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc2w-gemm_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_ppc64") {
++  source_set("qs8-vaddc_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"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -127119,15 +129475,15 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qs8-vaddc_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"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -127212,15 +129568,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_ppc64") {
++  source_set("qs8-vcvt_ppc64") {
 +    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-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -127280,15 +129635,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_ppc64_standalone") {
++  source_set("qs8-vcvt_ppc64_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-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -127391,14 +129745,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_ppc64") {
++  source_set("qs8-vlrelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -127457,14 +129811,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_ppc64_standalone") {
++  source_set("qs8-vlrelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
@@ -127534,14 +129888,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_ppc64") {
++  source_set("qs8-vmul_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -127624,14 +129978,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_ppc64_standalone") {
++  source_set("qs8-vmul_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -127675,14 +130029,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-igemm_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_ppc64") {
++  source_set("qs8-vmulc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -127739,14 +130093,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qs8-vmulc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -127828,14 +130182,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_ppc64") {
++  source_set("qs8-vprelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -127893,14 +130247,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_ppc64_standalone") {
++  source_set("qs8-vprelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -127968,14 +130322,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_ppc64") {
++  source_set("qs8-vpreluc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -128056,14 +130410,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vprelu_ppc64_standalone") {
++  source_set("qs8-vpreluc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -128131,14 +130485,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_ppc64") {
++  source_set("qs8-vrpreluc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -128219,14 +130573,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vpreluc_ppc64_standalone") {
++  source_set("qs8-vrpreluc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -128296,14 +130650,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_ppc64") {
++  source_set("qu8-dwconv_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -128384,14 +130741,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vrpreluc_ppc64_standalone") {
++  source_set("qu8-dwconv_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -128461,17 +130821,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_ppc64") {
++  source_set("qu8-f32-vcvt_ppc64") {
 +    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/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -128552,17 +130909,14 @@ Index: chromium-150.0.7871.46/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_ppc64_standalone") {
++  source_set("qu8-f32-vcvt_ppc64_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/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -128630,14 +130984,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_ppc64") {
++  source_set("qu8-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -128718,14 +131073,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_ppc64_standalone") {
++  source_set("qu8-gemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.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 = [
@@ -128793,15 +131149,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_ppc64") {
++  source_set("qu8-igemm_ppc64") {
 +    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-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -128882,15 +131238,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_ppc64_standalone") {
++  source_set("qu8-igemm_ppc64_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-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -128958,15 +131314,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_ppc64") {
++  source_set("qu8-rdsum_ppc64") {
 +    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-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -129047,15 +131402,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_ppc64_standalone") {
++  source_set("qu8-rdsum_ppc64_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-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -      sources = [
@@ -129098,14 +131452,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vmulc_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_ppc64") {
++  source_set("qu8-rsum_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -129161,14 +131515,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_ppc64_standalone") {
++  source_set("qu8-rsum_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -129247,14 +131601,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_ppc64") {
++  source_set("qu8-vadd_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -129308,14 +131663,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_ppc64_standalone") {
++  source_set("qu8-vadd_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-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"
 +    ]
  
 -      sources = [
@@ -129383,15 +131739,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_ppc64") {
++  source_set("qu8-vaddc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -129474,15 +131830,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_ppc64_standalone") {
++  source_set("qu8-vaddc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -129580,15 +131936,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_ppc64") {
++  source_set("qu8-vcvt_ppc64") {
 +    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-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -129646,15 +132001,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_ppc64_standalone") {
++  source_set("qu8-vcvt_ppc64_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-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -129722,14 +132076,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_ppc64") {
++  source_set("qu8-vlrelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -129812,14 +132166,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_ppc64_standalone") {
++  source_set("qu8-vlrelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
@@ -129889,14 +132243,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_ppc64") {
++  source_set("qu8-vmul_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -129979,14 +132333,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_ppc64_standalone") {
++  source_set("qu8-vmul_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -130056,14 +132410,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_ppc64") {
++  source_set("qu8-vmulc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -130144,14 +132498,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_ppc64_standalone") {
++  source_set("qu8-vmulc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -130219,14 +132573,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_ppc64") {
++  source_set("qu8-vprelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -130307,14 +132661,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_ppc64_standalone") {
++  source_set("qu8-vprelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -130382,14 +132736,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_ppc64") {
++  source_set("qu8-vpreluc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -130470,14 +132824,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_ppc64_standalone") {
++  source_set("qu8-vpreluc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -130547,14 +132901,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_ppc64") {
++  source_set("qu8-vrpreluc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -130635,14 +132989,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vpreluc_ppc64_standalone") {
++  source_set("qu8-vrpreluc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -130712,14 +133066,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_ppc64") {
++  source_set("reference_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
  
 -  if (build_with_chromium) {
@@ -130800,14 +133156,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vrpreluc_ppc64_standalone") {
++  source_set("reference_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
  
 -      sources = [
@@ -130875,16 +133233,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("reference_ppc64") {
++  source_set("s8-ibilinear_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -130965,16 +133321,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("reference_ppc64_standalone") {
++  source_set("s8-ibilinear_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -131042,14 +133396,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_ppc64") {
++  source_set("s8-maxpool_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -131130,14 +133484,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_ppc64_standalone") {
++  source_set("s8-maxpool_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -131205,14 +133559,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_ppc64") {
++  source_set("s8-rdminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -131293,14 +133648,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_ppc64_standalone") {
++  source_set("s8-rdminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -131343,15 +133699,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vmulc_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_ppc64") {
++  source_set("s8-rminmax_ppc64") {
 +    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/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -131407,15 +133764,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_ppc64_standalone") {
++  source_set("s8-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
++      "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"
 +    ]
  
 -      deps = [
@@ -131494,16 +133852,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_ppc64") {
++  source_set("s8-vclamp_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -131557,16 +133913,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_ppc64_standalone") {
++  source_set("s8-vclamp_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -131609,14 +133963,43 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vrpreluc_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_ppc64") {
++  source_set("subgraph_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.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/fp16_to_fp32.cc",
++    "src/src/subgraph/rope.c",
++    "src/src/subgraph/softmax.c",
++    "src/src/subgraph/space-to-depth-2d.c",
++    "src/src/subgraph/static-constant-pad.c",
++    "src/src/subgraph/static-reduce.c",
++    "src/src/subgraph/static-resize-bilinear-2d.c",
++    "src/src/subgraph/static-slice.c",
++    "src/src/subgraph/static-transpose.c",
++    "src/src/subgraph/subgraph-utils.c",
++    "src/src/subgraph/unary.c",
++    "src/src/subgraph/unpooling-2d.c",
++    "src/src/subgraph/validation.c"
 +    ]
  
 -      sources = [
@@ -131674,14 +134057,43 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_ppc64_standalone") {
++  source_set("subgraph_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.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/fp16_to_fp32.cc",
++    "src/src/subgraph/rope.c",
++    "src/src/subgraph/softmax.c",
++    "src/src/subgraph/space-to-depth-2d.c",
++    "src/src/subgraph/static-constant-pad.c",
++    "src/src/subgraph/static-reduce.c",
++    "src/src/subgraph/static-resize-bilinear-2d.c",
++    "src/src/subgraph/static-slice.c",
++    "src/src/subgraph/static-transpose.c",
++    "src/src/subgraph/subgraph-utils.c",
++    "src/src/subgraph/unary.c",
++    "src/src/subgraph/unpooling-2d.c",
++    "src/src/subgraph/validation.c"
 +    ]
  
 -      deps = [
@@ -131750,43 +134162,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("subgraph_ppc64") {
++  source_set("tables_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/rewrites/fp16_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/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" ]
@@ -131823,43 +134214,22 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("subgraph_ppc64_standalone") {
++  source_set("tables_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/rewrites/fp16_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/tables/exp2-k-over-2048.c",
++    "src/src/tables/exp2-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-16.c",
++    "src/src/tables/exp2minus-k-over-2048.c",
++    "src/src/tables/exp2minus-k-over-32.c",
++    "src/src/tables/exp2minus-k-over-4.c",
++    "src/src/tables/exp2minus-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-8.c",
++    "src/src/tables/vlog.c"
 +    ]
  
 -      sources = [
@@ -131971,22 +134341,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("tables_ppc64") {
++  source_set("u8-ibilinear_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/tables/exp2-k-over-2048.c",
-+    "src/src/tables/exp2-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-16.c",
-+    "src/src/tables/exp2minus-k-over-2048.c",
-+    "src/src/tables/exp2minus-k-over-32.c",
-+    "src/src/tables/exp2minus-k-over-4.c",
-+    "src/src/tables/exp2minus-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-8.c",
-+    "src/src/tables/vlog.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -132023,22 +134385,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("tables_ppc64_standalone") {
++  source_set("u8-ibilinear_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/tables/exp2-k-over-2048.c",
-+    "src/src/tables/exp2-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-16.c",
-+    "src/src/tables/exp2minus-k-over-2048.c",
-+    "src/src/tables/exp2minus-k-over-32.c",
-+    "src/src/tables/exp2minus-k-over-4.c",
-+    "src/src/tables/exp2minus-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-8.c",
-+    "src/src/tables/vlog.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -132153,14 +134507,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_ppc64") {
++  source_set("u8-lut32norm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -132197,14 +134551,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_ppc64_standalone") {
++  source_set("u8-lut32norm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
 -      sources = [
@@ -132323,14 +134677,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-lut32norm_ppc64") {
++  source_set("u8-maxpool_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -132367,14 +134721,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-lut32norm_ppc64_standalone") {
++  source_set("u8-maxpool_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -132500,14 +134854,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_ppc64") {
++  source_set("u8-rdminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -132561,14 +134916,15 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_ppc64_standalone") {
++  source_set("u8-rdminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -132723,15 +135079,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_ppc64") {
++  source_set("u8-rminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -132793,15 +135150,16 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_ppc64_standalone") {
++  source_set("u8-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -132844,16 +135202,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("u8-ibilinear_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_ppc64") {
++  source_set("u8-vclamp_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -132909,16 +135265,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_ppc64_standalone") {
++  source_set("u8-vclamp_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -133000,14 +135354,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_ppc64") {
++  source_set("x16-packw_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -133065,14 +135419,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_ppc64_standalone") {
++  source_set("x16-packw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c"
 +    ]
  
 -      sources = [
@@ -133663,7 +136017,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("x16-transposec_riscv64") {
+-    source_set("x16-packw_riscv64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -133674,7 +136028,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
+-        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -133724,13 +136078,13 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x16-transposec_riscv64_standalone") {
+-    source_set("x16-packw_riscv64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
+-        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -133757,13 +136111,12 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("x16-x32-packw_riscv64") {
+-    source_set("x16-transposec_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
--        "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c",
+-        "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -133798,7 +136151,7 @@ Index: chromium-150.0.7871.46/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_riscv64_standalone") {
+-    source_set("x16-transposec_riscv64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -133809,8 +136162,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
--        "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c",
+-        "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -133836,7 +136188,7 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("x24-transposec_riscv64") {
+-    source_set("x16-x32-packw_riscv64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -133852,7 +136204,8 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -133887,9 +136240,110 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x24-transposec_riscv64_standalone") {
+-    source_set("x16-x32-packw_riscv64_standalone") {
 -      cflags = []
++if (build_with_chromium) {
++  source_set("x32-unpool_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-unpool/x32-unpool-scalar.c"
++    ]
+ 
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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("x24-transposec_riscv64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/x24-transposec/gen/x24-transposec-1x2-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("x32-unpool_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-unpool/x32-unpool-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:pthreadpool_standalone",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("x24-transposec_riscv64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c",
@@ -133912,18 +136366,11 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+if (build_with_chromium) {
-+  source_set("x32-unpool_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("x32-packw_arch=rv64gcv-abi=lp64d") {
@@ -133948,20 +136395,24 @@ Index: chromium-150.0.7871.46/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("x64-transposec_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -133994,6 +136445,13 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}
@@ -134003,14 +136461,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-unpool_ppc64_standalone") {
++  source_set("x64-transposec_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -134115,14 +136573,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x64-transposec_ppc64") {
++  source_set("x8-lut_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -134183,14 +136641,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_ppc64_standalone") {
++  source_set("x8-lut_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -134233,14 +136691,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x32-transposec_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x8-lut_ppc64") {
++  source_set("x8-packq_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
  
 -      sources = [
@@ -134296,14 +136754,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_ppc64_standalone") {
++  source_set("x8-packq_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
  
 -      deps = [
@@ -134382,14 +136840,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x8-packq_ppc64") {
++  source_set("x8-packw_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -134443,14 +136904,17 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packq_ppc64_standalone") {
++  source_set("x8-packw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -134493,17 +136957,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x8-lut_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x8-packw_ppc64") {
++  source_set("x8-transposec_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -134559,17 +137020,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packw_ppc64_standalone") {
++  source_set("x8-transposec_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
 -      deps = [
@@ -134651,14 +137109,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x8-transposec_ppc64") {
++  source_set("xx-copy_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -134715,14 +137173,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_ppc64_standalone") {
++  source_set("xx-copy_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
  
 -      sources = [
@@ -134765,14 +137223,14 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -    source_set("x8-transposec_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("xx-copy_ppc64") {
++  source_set("xx-fill_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
  
 -      sources = [
@@ -134798,50 +137256,60 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("xx-copy_riscv64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/xx-copy/xx-copy-scalar-memcpy.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("xx-copy_riscv64") {
--      cflags = []
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-copy_ppc64_standalone") {
++  source_set("xx-fill_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/xx-copy/xx-copy-scalar-memcpy.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",
@@ -134849,35 +137317,11 @@ Index: chromium-150.0.7871.46/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("xx-copy_riscv64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("xx-fill_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -134901,77 +137345,32 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("xx-fill_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("xx-fill_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
-+    ]
- 
+-
 -      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" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("xx-fill_riscv64_standalone") {
--      cflags = []
 +if (build_with_chromium) {
 +  source_set("xx-pad_ppc64") {
 +    cflags = [
@@ -134983,6 +137382,25 @@ Index: chromium-150.0.7871.46/third_party/xnnpack/BUILD.gn
 +      "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("xx-fill_riscv64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/xx-fill/xx-fill-scalar-u16.c",
@@ -135006,18 +137424,6 @@ Index: chromium-150.0.7871.46/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" ]
    }
 +}

diff --git a/chromium-142-clang++-unknown-argument.patch b/chromium-142-clang++-unknown-argument.patch
deleted file mode 100644
index def6e25..0000000
--- a/chromium-142-clang++-unknown-argument.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up chromium-142.0.7444.52/build/config/compiler/BUILD.gn.clang++-unsupported-argument chromium-142.0.7444.52/build/config/compiler/BUILD.gn
---- chromium-142.0.7444.52/build/config/compiler/BUILD.gn.clang++-unsupported-argument	2025-10-28 19:41:59.131433882 +0100
-+++ chromium-142.0.7444.52/build/config/compiler/BUILD.gn	2025-10-28 19:42:51.792779638 +0100
-@@ -2160,9 +2160,6 @@ config("default_warnings") {
-       # TODO(crbug.com/40284799): Fix and re-enable.
-       "-Wno-thread-safety-reference-return",
- 
--      # TODO(crbug.com/376641662): Fix and re-enable.
--      "-Wno-nontrivial-memcall",
--
-       # TODO(crbug.com/432275627): Fix and re-enable.
-       "-Wno-uninitialized-const-pointer",
-     ]

diff --git a/chromium-142-el9-ffmpeg-5.1.x.patch b/chromium-142-el9-ffmpeg-5.1.x.patch
deleted file mode 100644
index fe526f7..0000000
--- a/chromium-142-el9-ffmpeg-5.1.x.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -up chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.cc.el9-ffmpeg-5.1.x chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.cc
---- chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.cc.el9-ffmpeg-5.1.x	2025-11-01 22:14:10.116779876 +0100
-+++ chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.cc	2025-11-01 22:14:10.134140132 +0100
-@@ -800,8 +803,13 @@ bool AVStreamToVideoDecoderConfig(const
-   }
- 
-   VideoTransformation video_transformation = VideoTransformation();
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
-+  for (int i = 0; i < stream->nb_side_data; i++) {
-+    const auto& side_data = stream->side_data[i];
-+#else
-   for (const auto& side_data :
-        AVCodecParametersCodedSideToSpan(stream->codecpar)) {
-+#endif
-     switch (side_data.type) {
-       case AV_PKT_DATA_DISPLAYMATRIX: {
-         CHECK_EQ(side_data.size, sizeof(int32_t) * 3 * 3);
-diff -up chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.h.el9-ffmpeg-5.1.x chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.h
---- chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.h.el9-ffmpeg-5.1.x	2025-10-24 18:42:30.000000000 +0200
-+++ chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.h	2025-11-02 08:06:48.997329630 +0100
-@@ -111,9 +111,13 @@ inline base::span<AVPacketSideData> AVCo
-   // https://ffmpeg.org/doxygen/trunk/structAVCodecParameters.html#a29643cfd94231e2d148a5d17b08d115b
-   // ffmpeg documentation: `nb_coded_side_data` is the amount of entries in
-   // `coded_side_data`.
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 31, 102)
-   return UNSAFE_BUFFERS(
-       base::span(codecpar->coded_side_data,
-                  base::checked_cast<size_t>(codecpar->nb_coded_side_data)));
-+#else
-+   return base::span<AVPacketSideData>();
-+#endif
- }
- 
- // Converts an int64_t timestamp in |time_base| units to a base::TimeDelta.
-diff -up chromium-142.0.7444.59/media/filters/audio_video_metadata_extractor.cc.el9-ffmpeg-5.1.x chromium-142.0.7444.59/media/filters/audio_video_metadata_extractor.cc
---- chromium-142.0.7444.59/media/filters/audio_video_metadata_extractor.cc.el9-ffmpeg-5.1.x	2025-10-24 18:42:30.000000000 +0200
-+++ chromium-142.0.7444.59/media/filters/audio_video_metadata_extractor.cc	2025-11-01 22:14:10.124748634 +0100
-@@ -109,17 +109,33 @@ bool AudioVideoMetadataExtractor::Extrac
-   container_info.type = format_context->iformat->name;
-   ExtractDictionary(format_context->metadata, &container_info.tags);
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
-+  for (unsigned int i = 0; i < format_context->nb_streams; ++i) {
-+    stream_infos_.push_back(StreamInfo());
-+#else
-   base::span<AVStream*> format_context_span =
-       AVFormatContextToSpan(format_context);
-   std::ranges::for_each(format_context_span, [&](AVStream* stream) {
-     stream_infos_.emplace_back();
-+#endif
-     StreamInfo& info = stream_infos_.back();
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
-+    AVStream* stream = format_context->streams[i];
-+    if (!stream)
-+      continue;
-+#else
-     if (!stream) {
-       return;
-     }
-+#endif
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
-+    for (int j = 0; j < stream->nb_side_data; j++) {
-+      const AVPacketSideData& sd = stream->side_data[j];
-+#else
-     for (const auto& sd : AVCodecParametersCodedSideToSpan(stream->codecpar)) {
-+#endif
-       if (sd.type == AV_PKT_DATA_DISPLAYMATRIX) {
-         CHECK_EQ(sd.size, sizeof(int32_t) * 3 * 3);
-         rotation_ = VideoTransformation::FromFFmpegDisplayMatrix(
-@@ -135,7 +151,11 @@ bool AudioVideoMetadataExtractor::Extrac
-     ExtractDictionary(stream->metadata, &info.tags);
- 
-     if (!stream->codecpar) {
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
-+      continue;
-+#else
-       return;
-+#endif
-     }
- 
-     info.type = avcodec_get_name(stream->codecpar->codec_id);
-@@ -158,7 +178,11 @@ bool AudioVideoMetadataExtractor::Extrac
-           reinterpret_cast<const char*>(stream->attached_pic.data),
-           stream->attached_pic.size);
-     }
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
-+  }
-+#else
-   });
-+#endif
- 
-   extracted_ = true;
-   return true;
-diff -up chromium-142.0.7444.59/media/filters/media_file_checker.cc.el9-ffmpeg-5.1.x chromium-142.0.7444.59/media/filters/media_file_checker.cc
---- chromium-142.0.7444.59/media/filters/media_file_checker.cc.el9-ffmpeg-5.1.x	2025-10-24 18:42:30.000000000 +0200
-+++ chromium-142.0.7444.59/media/filters/media_file_checker.cc	2025-11-01 22:14:10.125099595 +0100
-@@ -64,6 +64,10 @@ bool MediaFileChecker::Start(base::TimeD
-   // Remember the codec context for any decodable audio or video streams.
-   bool found_streams = false;
-   std::vector<Decoder> stream_contexts(format_context->nb_streams);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
-+  for (size_t i = 0; i < format_context->nb_streams; ++i) {
-+    AVCodecParameters* cp = format_context->streams[i]->codecpar;
-+#else
-   base::span<AVStream*> format_context_span =
-       AVFormatContextToSpan(format_context);
-   std::ranges::transform(
-@@ -85,9 +89,26 @@ bool MediaFileChecker::Start(base::TimeD
-           }
-         }
- 
-+#endif
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
-+    if (cp->codec_type == AVMEDIA_TYPE_AUDIO ||
-+        cp->codec_type == AVMEDIA_TYPE_VIDEO) {
-+      auto context = AVStreamToAVCodecContext(format_context->streams[i]);
-+      if (!context)
-+        continue;
-+      const AVCodec* codec = avcodec_find_decoder(cp->codec_id);
-+      if (codec && avcodec_open2(context.get(), codec, nullptr) >= 0) {
-+        auto loop = std::make_unique<FFmpegDecodingLoop>(context.get());
-+        stream_contexts[i] = {std::move(context), std::move(loop)};
-+        found_streams = true;
-+      }
-+    }
-+  }
-+#else
-         return Decoder{};
-       });
- 
-+#endif
-   if (!found_streams)
-     return false;
- 

diff --git a/chromium-149-clang++-unknown-argument.patch b/chromium-149-clang++-unknown-argument.patch
deleted file mode 100644
index 9cc7b35..0000000
--- a/chromium-149-clang++-unknown-argument.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up chromium-149.0.7827.53/build/config/compiler/BUILD.gn.me chromium-149.0.7827.53/build/config/compiler/BUILD.gn
---- chromium-149.0.7827.53/build/config/compiler/BUILD.gn.me	2026-04-06 11:35:59.082476460 +0200
-+++ chromium-149.0.7827.53/build/config/compiler/BUILD.gn	2026-04-06 11:36:52.267527294 +0200
-@@ -617,7 +617,6 @@ config("compiler") {
-     # 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
-diff -up chromium-149.0.7827.53/build/config/compiler/BUILD.gn.me chromium-149.0.7827.53/build/config/compiler/BUILD.gn
---- chromium-149.0.7827.53/build/config/compiler/BUILD.gn.me	2026-05-31 12:18:05.287133288 +0200
-+++ chromium-149.0.7827.53/build/config/compiler/BUILD.gn	2026-05-31 12:19:16.908256575 +0200
-@@ -588,12 +588,6 @@ config("compiler") {
-   if (is_clang) {
-     # Flags for diagnostics.
-     cflags += [ "-fcolor-diagnostics" ]
--    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" ]
-     }
-diff -up chromium-149.0.7827.53/build/config/sanitizers/sanitizers.gni.me chromium-149.0.7827.53/build/config/sanitizers/sanitizers.gni
---- chromium-149.0.7827.53/build/config/sanitizers/sanitizers.gni.me	2026-05-31 12:20:07.389243564 +0200
-+++ chromium-149.0.7827.53/build/config/sanitizers/sanitizers.gni	2026-05-31 12:20:43.632843203 +0200
-@@ -540,7 +540,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 --git a/chromium-150-Add-AutoDarkModeSkipImages-flag-to-bypass-image-dark-mode.patch b/chromium-150-Add-AutoDarkModeSkipImages-flag-to-bypass-image-dark-mode.patch
deleted file mode 100644
index 34d3c6a..0000000
--- a/chromium-150-Add-AutoDarkModeSkipImages-flag-to-bypass-image-dark-mode.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-150.0.7871.46/third_party/blink/renderer/platform/runtime_enabled_features.json5.me chromium-150.0.7871.46/third_party/blink/renderer/platform/runtime_enabled_features.json5
---- chromium-150.0.7871.46/third_party/blink/renderer/platform/runtime_enabled_features.json5.me	2026-07-01 11:42:50.002271226 +0200
-+++ chromium-150.0.7871.46/third_party/blink/renderer/platform/runtime_enabled_features.json5	2026-07-01 15:15:08.984906253 +0200
-@@ -761,7 +761,7 @@
-       // as if they are in light mode.
-       // P.N. `AutoDarkMode` needs to be applied separately.
-       name: "AutoDarkModeSkipImages",
--      base_feature: "none",
-+      base_feature: "AutoDarkModeSkipImages",
-     },
-     {
-       name: "Autofill",

diff --git a/chromium-150-Fix-get_path_info-on-empty-ar-in-unbundle-toolchain.patch b/chromium-150-Fix-get_path_info-on-empty-ar-in-unbundle-toolchain.patch
deleted file mode 100644
index 61daa78..0000000
--- a/chromium-150-Fix-get_path_info-on-empty-ar-in-unbundle-toolchain.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 7d6555b11f181bdc24ba56577f753a07add6e8c7
-Author: Matt Jolly <kangie@gentoo.org>
-Date:   Tue Jun 16 21:57:07 2026 -0700
-
-    build: Fix get_path_info on empty ar in unbundle toolchain
-    
-    Some toolchains leave ar empty during initial setup, causing GN to error
-    when get_path_info() is called with an empty string. Guard the check to
-    only run when ar is not empty.
-    
-    Signed-off-by: Matt Jolly <kangie@gentoo.org>
-    Change-Id: I87615806ddfda6f262a7500b0c5b6fed1f452985
-    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7949777
-    Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
-    Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
-    Reviewed-by: Matt Stark <msta@google.com>
-    Cr-Commit-Position: refs/heads/main@{#1648076}
-
---- a/build/toolchain/gcc_toolchain.gni
-+++ b/build/toolchain/gcc_toolchain.gni
-@@ -408,8 +408,9 @@ template("single_gcc_toolchain") {
-       } else {
-         command = "rm -f {{output}} && $command"
- 
--        # Add ar to inputs if it's not from $PATH.
--        if (get_path_info(ar, "file") != ar) {
-+        # Add ar to inputs if it's not from $PATH. Some toolchains leave
-+        # |ar| empty during toolchain setup, so guard get_path_info() here.
-+        if (ar != "" && get_path_info(ar, "file") != ar) {
-           inputs =
-               [ get_path_info(rebase_path(ar, ".", root_out_dir), "abspath") ]
-         }

diff --git a/chromium-150-Make-dark-mode-apply-filter-to-images-irrespective-of-layout-zoom.patch b/chromium-150-Make-dark-mode-apply-filter-to-images-irrespective-of-layout-zoom.patch
deleted file mode 100644
index 8ecaed0..0000000
--- a/chromium-150-Make-dark-mode-apply-filter-to-images-irrespective-of-layout-zoom.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-commit cf9588e0655663e301915e53ec5a8df8ae874ce4
-Author: Prashant Nevase <pnevase@microsoft.com>
-Date:   Fri Jun 19 06:19:47 2026 -0700
-
-    Make dark mode apply filter to images irrespective of layout zoom
-    
-    The layout zoom factor combines page zoom with the device scale factor.
-    When zoom is applied, the page size scales accordingly, and images are
-    drawn relative to the new page size. This should account for the higher
-    icon threshold ratio compared with the 1x scale. Otherwise, the same
-    image may receive different dark mode filters at different scales,
-    creating a poor user experience. To avoid this, dark mode image
-    classification should remain consistent across layout zoom factors.
-    
-    CSS zoom is still considered, because it changes the ratio of drawn
-    image size to display size in 1x scale.
-    
-    Bug: 449909524
-    Change-Id: Ia420007b278a1f592c353557d4cbf66a7c575c42
-    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7961660
-    Reviewed-by: Stephen Chenney <schenney@chromium.org>
-    Commit-Queue: Prashant Nevase <pnevase@microsoft.com>
-    Auto-Submit: Prashant Nevase <pnevase@microsoft.com>
-    Cr-Commit-Position: refs/heads/main@{#1649638}
-
-diff --git a/third_party/blink/renderer/core/paint/paint_auto_dark_mode.cc b/third_party/blink/renderer/core/paint/paint_auto_dark_mode.cc
-index 1246f179f9b19..5b34283d7a556 100644
---- a/third_party/blink/renderer/core/paint/paint_auto_dark_mode.cc
-+++ b/third_party/blink/renderer/core/paint/paint_auto_dark_mode.cc
-@@ -41,6 +41,7 @@ DarkModeFilter::ImageType GetImageType(float dest_to_device_ratio,
- 
- float GetRatio(const display::ScreenInfo& screen_info,
-                const gfx::RectF& dest_rect) {
-+  // Compute device rect in device pixels.
-   const gfx::SizeF& device_rect = gfx::ScaleSize(
-       gfx::SizeF(screen_info.rect.size()), screen_info.device_scale_factor);
- 
-@@ -48,6 +49,27 @@ float GetRatio(const display::ScreenInfo& screen_info,
-                   dest_rect.height() / device_rect.height());
- }
- 
-+// Classifies an image after undoing the frame's layout zoom factor.
-+// |dest_rect| comes from layout geometry and includes layout zoom (page zoom
-+// and potentially DSF) and CSS zoom. Undo only layout zoom so page zoom and
-+// DSF do not affect classification, while CSS zoom still does. |src_rect| is
-+// derived from the image's intrinsic pixel size and is already
-+// zoom-independent, so it must be left untouched.
-+DarkModeFilter::ImageType GetImageTypeWithZoom(
-+    const display::ScreenInfo& screen_info,
-+    float zoom,
-+    const gfx::RectF& dest_rect,
-+    const gfx::RectF& src_rect) {
-+  gfx::RectF unzoomed_dest_rect = dest_rect;
-+  if (zoom > 0.f && zoom != 1.f) {
-+    unzoomed_dest_rect.Scale(1.f / zoom);
-+  }
-+
-+  return GetImageType(GetRatio(screen_info, unzoomed_dest_rect),
-+                      gfx::ToEnclosingRect(unzoomed_dest_rect),
-+                      gfx::ToEnclosingRect(src_rect));
-+}
-+
- }  // namespace
- 
- // static
-@@ -63,20 +85,19 @@ ImageAutoDarkMode ImageClassifierHelper::GetImageAutoDarkMode(
-   const display::ScreenInfo& screen_info =
-       local_frame.GetChromeClient().GetScreenInfo(local_frame);
- 
--  return ImageAutoDarkMode(role, style.ForceDark(),
--                           GetImageType(GetRatio(screen_info, dest_rect),
--                                        gfx::ToEnclosingRect(dest_rect),
--                                        gfx::ToEnclosingRect(src_rect)));
-+  const float layout_zoom = local_frame.LayoutZoomFactor();
-+  return ImageAutoDarkMode(
-+      role, style.ForceDark(),
-+      GetImageTypeWithZoom(screen_info, layout_zoom, dest_rect, src_rect));
- }
- 
- // static
- DarkModeFilter::ImageType ImageClassifierHelper::GetImageTypeForTesting(
-     display::ScreenInfo& screen_info,
-     const gfx::RectF& dest_rect,
--    const gfx::RectF& src_rect) {
--  return GetImageType(GetRatio(screen_info, dest_rect),
--                      gfx::ToEnclosingRect(dest_rect),
--                      gfx::ToEnclosingRect(src_rect));
-+    const gfx::RectF& src_rect,
-+    float zoom) {
-+  return GetImageTypeWithZoom(screen_info, zoom, dest_rect, src_rect);
- }
- 
- }  // namespace blink
-diff --git a/third_party/blink/renderer/core/paint/paint_auto_dark_mode.h b/third_party/blink/renderer/core/paint/paint_auto_dark_mode.h
-index f3eda0113391a..9bf8df1c33a84 100644
---- a/third_party/blink/renderer/core/paint/paint_auto_dark_mode.h
-+++ b/third_party/blink/renderer/core/paint/paint_auto_dark_mode.h
-@@ -42,7 +42,8 @@ class ImageClassifierHelper {
-   CORE_EXPORT static DarkModeFilter::ImageType GetImageTypeForTesting(
-       display::ScreenInfo& screen_info,
-       const gfx::RectF& dest_rect,
--      const gfx::RectF& src_rect);
-+      const gfx::RectF& src_rect,
-+      float zoom = 1.0f);
- };
- 
- }  // namespace blink
-diff --git a/third_party/blink/renderer/core/paint/paint_auto_dark_mode_test.cc b/third_party/blink/renderer/core/paint/paint_auto_dark_mode_test.cc
-index 705a304de1ce7..77ff0f069188e 100644
---- a/third_party/blink/renderer/core/paint/paint_auto_dark_mode_test.cc
-+++ b/third_party/blink/renderer/core/paint/paint_auto_dark_mode_test.cc
-@@ -10,7 +10,69 @@
- 
- namespace blink {
- 
--class PaintAutoDarkModeTest : public testing::Test {};
-+class PaintAutoDarkModeTest : public testing::Test {
-+ public:
-+  void TestApplyFilterToImageIrrespectiveOfPageZoom(
-+      display::ScreenInfo screen_info) {
-+    DarkModeSettings settings;
-+    DarkModeFilter filter(settings);
-+
-+    float page_zoom = 1.0f;
-+    float layout_zoom = 1.0f;
-+    float css_zoom = 1.0f;
-+    gfx::RectF src_rect;
-+    gfx::RectF dest_rect;
-+
-+    // A 50x50 CSS icon gets filtered even if |dest_rect| becomes larger 250x250
-+    // than threshold size in larger zoom levels.
-+    src_rect = gfx::RectF(50, 50);
-+    page_zoom = 5.0f;
-+    css_zoom = 1.0f;
-+    layout_zoom = page_zoom * screen_info.device_scale_factor;
-+    dest_rect =
-+        gfx::RectF(50 * layout_zoom * css_zoom, 50 * layout_zoom * css_zoom);
-+    EXPECT_TRUE(filter.ShouldApplyFilterToImage(
-+        ImageClassifierHelper::GetImageTypeForTesting(screen_info, dest_rect,
-+                                                      src_rect, layout_zoom)));
-+
-+    // A 50x50 CSS icon with css zoom 5.0f becomes 250x250 and does not get
-+    // filterred as |dest_rect| is larger than threshold size.
-+    src_rect = gfx::RectF(50, 50);
-+    page_zoom = 5.0f;
-+    css_zoom = 5.0f;
-+    layout_zoom = page_zoom * screen_info.device_scale_factor;
-+    dest_rect =
-+        gfx::RectF(50 * layout_zoom * css_zoom, 50 * layout_zoom * css_zoom);
-+    EXPECT_FALSE(filter.ShouldApplyFilterToImage(
-+        ImageClassifierHelper::GetImageTypeForTesting(screen_info, dest_rect,
-+                                                      src_rect, layout_zoom)));
-+
-+    // An image with 200x200 CSS size gets classified as photo and does not get
-+    // filtered, even if |dest_rect| becomes smaller 50x50 than threshold size
-+    // in smaller zoom levels.
-+    src_rect = gfx::RectF(200, 200);
-+    page_zoom = 0.25f;
-+    css_zoom = 1.0f;
-+    layout_zoom = page_zoom * screen_info.device_scale_factor;
-+    dest_rect =
-+        gfx::RectF(200 * layout_zoom * css_zoom, 200 * layout_zoom * css_zoom);
-+    EXPECT_FALSE(filter.ShouldApplyFilterToImage(
-+        ImageClassifierHelper::GetImageTypeForTesting(screen_info, dest_rect,
-+                                                      src_rect, layout_zoom)));
-+
-+    // An image with 200x200 CSS size becomes 20x20 CSS size and gets classified
-+    // as icon as the CSS size is below the threshold.
-+    src_rect = gfx::RectF(200, 200);
-+    page_zoom = 0.25f;
-+    css_zoom = 0.1f;
-+    layout_zoom = page_zoom * screen_info.device_scale_factor;
-+    dest_rect =
-+        gfx::RectF(200 * layout_zoom * css_zoom, 200 * layout_zoom * css_zoom);
-+    EXPECT_TRUE(filter.ShouldApplyFilterToImage(
-+        ImageClassifierHelper::GetImageTypeForTesting(screen_info, dest_rect,
-+                                                      src_rect, layout_zoom)));
-+  }
-+};
- 
- TEST_F(PaintAutoDarkModeTest, ShouldApplyFilterToImage) {
-   DarkModeSettings settings;
-@@ -77,4 +139,21 @@ TEST_F(PaintAutoDarkModeTest, ShouldApplyFilterToImageOnMobile) {
-           screen_info, gfx::RectF(180, 180), gfx::RectF(180, 180))));
- }
- 
-+TEST_F(PaintAutoDarkModeTest, ShouldApplyFilterToImageIrrespectiveOfPageZoom) {
-+  display::ScreenInfo screen_info;
-+  screen_info.rect = gfx::Rect(1920, 1080);
-+  screen_info.device_scale_factor = 1.0f;
-+
-+  TestApplyFilterToImageIrrespectiveOfPageZoom(screen_info);
-+}
-+
-+TEST_F(PaintAutoDarkModeTest,
-+       ShouldApplyFilterToImageIrrespectiveOfPageZoomOnMobile) {
-+  display::ScreenInfo screen_info;
-+  screen_info.rect = gfx::Rect(360, 780);
-+  screen_info.device_scale_factor = 3.0f;
-+
-+  TestApplyFilterToImageIrrespectiveOfPageZoom(screen_info);
-+}
-+
- }  // namespace blink

diff --git a/chromium-150-Omit-ar-from-inputs-when-resolved-via-PATH.patch b/chromium-150-Omit-ar-from-inputs-when-resolved-via-PATH.patch
deleted file mode 100644
index 32c24c6..0000000
--- a/chromium-150-Omit-ar-from-inputs-when-resolved-via-PATH.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 60f987d8d5f7272793a40290d060b8f50933f825
-Author: Takuto Ikuta <tikuta@chromium.org>
-Date:   Mon Jun 8 19:43:20 2026 -0700
-
-    build: Omit ar from inputs when resolved via $PATH
-    
-    The GN build configuration previously added the `ar` tool to the inputs
-    list unconditionally. However, if the `ar` tool is specified simply by
-    its filename and is resolved via the system `$PATH`, it should not be
-    tracked as a direct input dependency.
-    
-    This change adds a condition to verify if `ar` is an explicit path
-    rather than just a filename. It only includes `ar` in the action's
-    inputs list when it is not resolved from `$PATH`.
-    
-    This is to address
-    https://crrev.com/c/7835150/8/build/toolchain/gcc_toolchain.gni#406
-    
-    Bug: 358521078
-    Change-Id: I096ac4aa7f3b697c58c94af1349159b9c87f4201
-    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7904982
-    Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
-    Reviewed-by: Matt Stark <msta@google.com>
-    Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
-    Cr-Commit-Position: refs/heads/main@{#1643634}
-
---- a/build/toolchain/gcc_toolchain.gni
-+++ b/build/toolchain/gcc_toolchain.gni
-@@ -407,8 +407,12 @@ template("single_gcc_toolchain") {
-         command = "cmd /s /c \"\"$python_path\" $tool_wrapper_path delete-file {{output}} && $command\""
-       } else {
-         command = "rm -f {{output}} && $command"
--        inputs =
--            [ get_path_info(rebase_path(ar, ".", root_out_dir), "abspath") ]
-+
-+        # Add ar to inputs if it's not from $PATH.
-+        if (get_path_info(ar, "file") != ar) {
-+          inputs =
-+              [ get_path_info(rebase_path(ar, ".", root_out_dir), "abspath") ]
-+        }
-       }
- 
-       # Almost all targets build with //build/config/compiler:thin_archive which

diff --git a/chromium-150-Use-64px-css-pixels-absolute-threshold-for-dark-image-classification.patch b/chromium-150-Use-64px-css-pixels-absolute-threshold-for-dark-image-classification.patch
deleted file mode 100644
index 6dc9b17..0000000
--- a/chromium-150-Use-64px-css-pixels-absolute-threshold-for-dark-image-classification.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-commit 2c0b79c57c1726f359bcd87137474e854b1aeb38
-Author: Prashant Nevase <pnevase@microsoft.com>
-Date:   Thu Jun 25 08:11:34 2026 -0700
-
-    Use 64px css pixels absolute threshold for dark image classification.
-    
-    The previous ratio-based threshold scaled with the screen size and
-    device scale factor, so the same image could be classified differently
-    depending on the display it was shown on. This produced inconsistent
-    dark mode results across displays of different sizes and device scale
-    factors.
-    
-    Replace the screen-size ratio heuristic (kMaxIconRatio) with a single
-    absolute size threshold of 64 CSS pixels for classifying images as icons
-    in auto dark mode. The threshold is compared after undoing the frame's
-    layout zoom factor (page zoom and device scale factor), so
-    classification is stable across devices and page zoom levels while CSS
-    zoom still affects the drawn size and therefore the result.
-    
-    This removes the dependency on display::ScreenInfo from the
-    classification path and simplifies GetImageType() to a pure size check.
-    
-    Bug: 449909524
-    Change-Id: I447ec7a1f94fed3004889dfe2bd78bf8392ddd61
-    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8005176
-    Reviewed-by: Stephen Chenney <schenney@chromium.org>
-    Commit-Queue: Prashant Nevase <pnevase@microsoft.com>
-    Cr-Commit-Position: refs/heads/main@{#1652434}
-
-diff --git a/third_party/blink/renderer/core/paint/paint_auto_dark_mode.cc b/third_party/blink/renderer/core/paint/paint_auto_dark_mode.cc
-index 5b34283d7a556..658f6a4e4f6fd 100644
---- a/third_party/blink/renderer/core/paint/paint_auto_dark_mode.cc
-+++ b/third_party/blink/renderer/core/paint/paint_auto_dark_mode.cc
-@@ -5,32 +5,26 @@
- #include "third_party/blink/renderer/core/paint/paint_auto_dark_mode.h"
- 
- #include "third_party/blink/renderer/core/frame/local_frame.h"
--#include "third_party/blink/renderer/core/page/chrome_client.h"
--#include "ui/display/screen_info.h"
- #include "ui/gfx/geometry/rect.h"
- #include "ui/gfx/geometry/rect_conversions.h"
- 
- namespace blink {
- 
- namespace {
--
--// The maximum ratio of image size to screen size that is considered an icon.
--constexpr float kMaxIconRatio = 0.13f;
--constexpr int kMaxImageLength = 50;
-+// Images with both width and height smaller than this value are considered
-+// icons.
-+constexpr int kMaxImageLength = 64;
- // Images with either dimension less than this value are considered separators.
- constexpr int kMaxImageSeparatorLength = 8;
- 
- // We need to do image classification first before calling
- // DarkModeFilter::GenerateImageFilter.
--DarkModeFilter::ImageType GetImageType(float dest_to_device_ratio,
--                                       const gfx::Rect& dest_rect,
-+DarkModeFilter::ImageType GetImageType(const gfx::Rect& dest_rect,
-                                        const gfx::Rect& src_rect) {
--  // TODO: Use a viewport relative threshold for the size check instead of
--  // absolute threshold.
--  if (dest_to_device_ratio <= kMaxIconRatio ||
--      (dest_rect.width() <= kMaxImageLength &&
--       dest_rect.height() <= kMaxImageLength))
-+  if (dest_rect.width() <= kMaxImageLength &&
-+      dest_rect.height() <= kMaxImageLength) {
-     return DarkModeFilter::ImageType::kIcon;
-+  }
- 
-   if (src_rect.width() <= kMaxImageSeparatorLength ||
-       src_rect.height() <= kMaxImageSeparatorLength)
-@@ -39,34 +33,21 @@ DarkModeFilter::ImageType GetImageType(float dest_to_device_ratio,
-   return DarkModeFilter::ImageType::kPhoto;
- }
- 
--float GetRatio(const display::ScreenInfo& screen_info,
--               const gfx::RectF& dest_rect) {
--  // Compute device rect in device pixels.
--  const gfx::SizeF& device_rect = gfx::ScaleSize(
--      gfx::SizeF(screen_info.rect.size()), screen_info.device_scale_factor);
--
--  return std::max(dest_rect.width() / device_rect.width(),
--                  dest_rect.height() / device_rect.height());
--}
--
- // Classifies an image after undoing the frame's layout zoom factor.
- // |dest_rect| comes from layout geometry and includes layout zoom (page zoom
- // and potentially DSF) and CSS zoom. Undo only layout zoom so page zoom and
- // DSF do not affect classification, while CSS zoom still does. |src_rect| is
- // derived from the image's intrinsic pixel size and is already
- // zoom-independent, so it must be left untouched.
--DarkModeFilter::ImageType GetImageTypeWithZoom(
--    const display::ScreenInfo& screen_info,
--    float zoom,
--    const gfx::RectF& dest_rect,
--    const gfx::RectF& src_rect) {
-+DarkModeFilter::ImageType GetImageTypeWithZoom(float zoom,
-+                                               const gfx::RectF& dest_rect,
-+                                               const gfx::RectF& src_rect) {
-   gfx::RectF unzoomed_dest_rect = dest_rect;
-   if (zoom > 0.f && zoom != 1.f) {
-     unzoomed_dest_rect.Scale(1.f / zoom);
-   }
- 
--  return GetImageType(GetRatio(screen_info, unzoomed_dest_rect),
--                      gfx::ToEnclosingRect(unzoomed_dest_rect),
-+  return GetImageType(gfx::ToEnclosingRect(unzoomed_dest_rect),
-                       gfx::ToEnclosingRect(src_rect));
- }
- 
-@@ -82,22 +63,18 @@ ImageAutoDarkMode ImageClassifierHelper::GetImageAutoDarkMode(
-   if (!style.ForceDark())
-     return ImageAutoDarkMode::Disabled();
- 
--  const display::ScreenInfo& screen_info =
--      local_frame.GetChromeClient().GetScreenInfo(local_frame);
--
-   const float layout_zoom = local_frame.LayoutZoomFactor();
-   return ImageAutoDarkMode(
-       role, style.ForceDark(),
--      GetImageTypeWithZoom(screen_info, layout_zoom, dest_rect, src_rect));
-+      GetImageTypeWithZoom(layout_zoom, dest_rect, src_rect));
- }
- 
- // static
- DarkModeFilter::ImageType ImageClassifierHelper::GetImageTypeForTesting(
--    display::ScreenInfo& screen_info,
-     const gfx::RectF& dest_rect,
-     const gfx::RectF& src_rect,
-     float zoom) {
--  return GetImageTypeWithZoom(screen_info, zoom, dest_rect, src_rect);
-+  return GetImageTypeWithZoom(zoom, dest_rect, src_rect);
- }
- 
- }  // namespace blink
-diff --git a/third_party/blink/renderer/core/paint/paint_auto_dark_mode.h b/third_party/blink/renderer/core/paint/paint_auto_dark_mode.h
-index 9bf8df1c33a84..afd57eee2b456 100644
---- a/third_party/blink/renderer/core/paint/paint_auto_dark_mode.h
-+++ b/third_party/blink/renderer/core/paint/paint_auto_dark_mode.h
-@@ -40,7 +40,6 @@ class ImageClassifierHelper {
-           DarkModeFilter::ElementRole::kBackground);
- 
-   CORE_EXPORT static DarkModeFilter::ImageType GetImageTypeForTesting(
--      display::ScreenInfo& screen_info,
-       const gfx::RectF& dest_rect,
-       const gfx::RectF& src_rect,
-       float zoom = 1.0f);
-diff --git a/third_party/blink/renderer/core/paint/paint_auto_dark_mode_test.cc b/third_party/blink/renderer/core/paint/paint_auto_dark_mode_test.cc
-index 77ff0f069188e..cf05ea1a9e8af 100644
---- a/third_party/blink/renderer/core/paint/paint_auto_dark_mode_test.cc
-+++ b/third_party/blink/renderer/core/paint/paint_auto_dark_mode_test.cc
-@@ -32,8 +32,8 @@ class PaintAutoDarkModeTest : public testing::Test {
-     dest_rect =
-         gfx::RectF(50 * layout_zoom * css_zoom, 50 * layout_zoom * css_zoom);
-     EXPECT_TRUE(filter.ShouldApplyFilterToImage(
--        ImageClassifierHelper::GetImageTypeForTesting(screen_info, dest_rect,
--                                                      src_rect, layout_zoom)));
-+        ImageClassifierHelper::GetImageTypeForTesting(dest_rect, src_rect,
-+                                                      layout_zoom)));
- 
-     // A 50x50 CSS icon with css zoom 5.0f becomes 250x250 and does not get
-     // filterred as |dest_rect| is larger than threshold size.
-@@ -44,8 +44,8 @@ class PaintAutoDarkModeTest : public testing::Test {
-     dest_rect =
-         gfx::RectF(50 * layout_zoom * css_zoom, 50 * layout_zoom * css_zoom);
-     EXPECT_FALSE(filter.ShouldApplyFilterToImage(
--        ImageClassifierHelper::GetImageTypeForTesting(screen_info, dest_rect,
--                                                      src_rect, layout_zoom)));
-+        ImageClassifierHelper::GetImageTypeForTesting(dest_rect, src_rect,
-+                                                      layout_zoom)));
- 
-     // An image with 200x200 CSS size gets classified as photo and does not get
-     // filtered, even if |dest_rect| becomes smaller 50x50 than threshold size
-@@ -57,8 +57,8 @@ class PaintAutoDarkModeTest : public testing::Test {
-     dest_rect =
-         gfx::RectF(200 * layout_zoom * css_zoom, 200 * layout_zoom * css_zoom);
-     EXPECT_FALSE(filter.ShouldApplyFilterToImage(
--        ImageClassifierHelper::GetImageTypeForTesting(screen_info, dest_rect,
--                                                      src_rect, layout_zoom)));
-+        ImageClassifierHelper::GetImageTypeForTesting(dest_rect, src_rect,
-+                                                      layout_zoom)));
- 
-     // An image with 200x200 CSS size becomes 20x20 CSS size and gets classified
-     // as icon as the CSS size is below the threshold.
-@@ -69,8 +69,8 @@ class PaintAutoDarkModeTest : public testing::Test {
-     dest_rect =
-         gfx::RectF(200 * layout_zoom * css_zoom, 200 * layout_zoom * css_zoom);
-     EXPECT_TRUE(filter.ShouldApplyFilterToImage(
--        ImageClassifierHelper::GetImageTypeForTesting(screen_info, dest_rect,
--                                                      src_rect, layout_zoom)));
-+        ImageClassifierHelper::GetImageTypeForTesting(dest_rect, src_rect,
-+                                                      layout_zoom)));
-   }
- };
- 
-@@ -78,44 +78,40 @@ TEST_F(PaintAutoDarkModeTest, ShouldApplyFilterToImage) {
-   DarkModeSettings settings;
-   DarkModeFilter filter(settings);
- 
--  display::ScreenInfo screen_info;
--  screen_info.rect = gfx::Rect(1920, 1080);
--  screen_info.device_scale_factor = 1.0f;
--
-   // |dst| is smaller than threshold size.
-   EXPECT_TRUE(filter.ShouldApplyFilterToImage(
--      ImageClassifierHelper::GetImageTypeForTesting(
--          screen_info, gfx::RectF(50, 50), gfx::RectF(50, 50))));
-+      ImageClassifierHelper::GetImageTypeForTesting(gfx::RectF(50, 50),
-+                                                    gfx::RectF(50, 50))));
- 
-   // |dst| is smaller than threshold size, even |src| is larger.
-   EXPECT_TRUE(filter.ShouldApplyFilterToImage(
--      ImageClassifierHelper::GetImageTypeForTesting(
--          screen_info, gfx::RectF(50, 50), gfx::RectF(200, 200))));
-+      ImageClassifierHelper::GetImageTypeForTesting(gfx::RectF(50, 50),
-+                                                    gfx::RectF(200, 200))));
- 
-   // |dst| is smaller than threshold size, |src| is smaller.
-   EXPECT_TRUE(filter.ShouldApplyFilterToImage(
--      ImageClassifierHelper::GetImageTypeForTesting(
--          screen_info, gfx::RectF(50, 50), gfx::RectF(20, 20))));
-+      ImageClassifierHelper::GetImageTypeForTesting(gfx::RectF(50, 50),
-+                                                    gfx::RectF(20, 20))));
- 
-   // |src| having very smaller width, even |dst| is larger than threshold size.
-   EXPECT_TRUE(filter.ShouldApplyFilterToImage(
--      ImageClassifierHelper::GetImageTypeForTesting(
--          screen_info, gfx::RectF(200, 5), gfx::RectF(200, 5))));
-+      ImageClassifierHelper::GetImageTypeForTesting(gfx::RectF(200, 5),
-+                                                    gfx::RectF(200, 5))));
- 
-   // |src| having very smaller height, even |dst| is larger than threshold size.
-   EXPECT_TRUE(filter.ShouldApplyFilterToImage(
--      ImageClassifierHelper::GetImageTypeForTesting(
--          screen_info, gfx::RectF(5, 200), gfx::RectF(5, 200))));
-+      ImageClassifierHelper::GetImageTypeForTesting(gfx::RectF(5, 200),
-+                                                    gfx::RectF(5, 200))));
- 
-   // |dst| is larger than threshold size.
-   EXPECT_FALSE(filter.ShouldApplyFilterToImage(
--      ImageClassifierHelper::GetImageTypeForTesting(
--          screen_info, gfx::RectF(200, 200), gfx::RectF(20, 20))));
-+      ImageClassifierHelper::GetImageTypeForTesting(gfx::RectF(200, 200),
-+                                                    gfx::RectF(20, 20))));
- 
-   // |dst| is larger than threshold size.
-   EXPECT_FALSE(filter.ShouldApplyFilterToImage(
--      ImageClassifierHelper::GetImageTypeForTesting(
--          screen_info, gfx::RectF(20, 200), gfx::RectF(20, 200))));
-+      ImageClassifierHelper::GetImageTypeForTesting(gfx::RectF(20, 200),
-+                                                    gfx::RectF(20, 200))));
- }
- 
- // Test for mobile display configuration
-@@ -126,17 +122,19 @@ TEST_F(PaintAutoDarkModeTest, ShouldApplyFilterToImageOnMobile) {
-   display::ScreenInfo screen_info;
-   screen_info.rect = gfx::Rect(360, 780);
-   screen_info.device_scale_factor = 3.0f;
-+  const float layout_zoom = screen_info.device_scale_factor;
- 
--  // 44x44 css image which is above the physical size threshold
--  // but with in the device ratio threshold
-+  // 44x44 CSS icon (132x132 device pixels) is below the threshold and filtered
-+  // after undoing the layout zoom (DSF).
-   EXPECT_TRUE(filter.ShouldApplyFilterToImage(
-       ImageClassifierHelper::GetImageTypeForTesting(
--          screen_info, gfx::RectF(132, 132), gfx::RectF(132, 132))));
-+          gfx::RectF(132, 132), gfx::RectF(132, 132), layout_zoom)));
- 
--  // 60x60 css image
-+  // 70x70 CSS image (210x210 device pixels) is above the threshold and not
-+  // filtered.
-   EXPECT_FALSE(filter.ShouldApplyFilterToImage(
-       ImageClassifierHelper::GetImageTypeForTesting(
--          screen_info, gfx::RectF(180, 180), gfx::RectF(180, 180))));
-+          gfx::RectF(210, 210), gfx::RectF(210, 210), layout_zoom)));
- }
- 
- TEST_F(PaintAutoDarkModeTest, ShouldApplyFilterToImageIrrespectiveOfPageZoom) {

diff --git a/chromium-150-sysroot.patch b/chromium-150-sysroot.patch
deleted file mode 100644
index 28c0782..0000000
--- a/chromium-150-sysroot.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit b93239da427a5019a9742d44e50e9996c1b04ea9
-Author: Nathan Pratta Teodosio <nathan.teodosio@canonical.com>
-Date:   Fri Jun 19 09:06:46 2026 -0700
-
-    Only pass sysroot if use_sysroot.
-    
-    Fixes the build when use_sysroot = false as then 'sysroot' variable is empty.
-    
-    Bug: None
-    Change-Id: I7fc7ba35f3ba416af0cbd8df94393dc901724b8b
-    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7927226
-    Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
-    Commit-Queue: Andrew Grieve <agrieve@chromium.org>
-    Reviewed-by: Andrew Grieve <agrieve@chromium.org>
-    Cr-Commit-Position: refs/heads/main@{#1649706}
-
---- a/build/modules/BUILD.gn
-+++ b/build/modules/BUILD.gn
-@@ -218,7 +218,7 @@ if (use_unified_system_module) {
-         # otherwise.
-         "--append-module=std.new:export new_h\\nexport vcruntime_exception",
-       ]
--    } else {
-+    } else if (use_sysroot) {
-       # We need to pass the sysroot in so that it can scan it to generate a
-       # modulemap for the sysroot headers.
-       args += [

diff --git a/chromium-151-clang++-unknown-argument.patch b/chromium-151-clang++-unknown-argument.patch
new file mode 100644
index 0000000..9484481
--- /dev/null
+++ b/chromium-151-clang++-unknown-argument.patch
@@ -0,0 +1,48 @@
+diff -up chromium-151.0.7922.47/build/config/compiler/BUILD.gn.me chromium-151.0.7922.47/build/config/compiler/BUILD.gn
+--- chromium-151.0.7922.47/build/config/compiler/BUILD.gn.me	2026-07-23 11:54:01.269128807 +0200
++++ chromium-151.0.7922.47/build/config/compiler/BUILD.gn	2026-07-23 11:58:32.694584084 +0200
+@@ -576,14 +576,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" ]
+     }
+@@ -617,9 +609,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
+@@ -1925,8 +1914,6 @@ config("default_warnings") {
+       # TODO(crbug.com/40284799): Fix and re-enable.
+       "-Wno-thread-safety-reference-return",
+ 
+-      # TODO(crbug.com/376641662): Fix and re-enable.
+-      "-Wno-nontrivial-memcall",
+     ]
+ 
+     if (!is_wasm) {
+diff -up chromium-151.0.7922.47/build/config/sanitizers/sanitizers.gni.me chromium-151.0.7922.47/build/config/sanitizers/sanitizers.gni
+--- chromium-151.0.7922.47/build/config/sanitizers/sanitizers.gni.me	2026-07-23 11:56:11.855123098 +0200
++++ chromium-151.0.7922.47/build/config/sanitizers/sanitizers.gni	2026-07-23 11:56:26.260247113 +0200
+@@ -540,7 +540,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 --git a/chromium-151-el9-ffmpeg-5.1.x.patch b/chromium-151-el9-ffmpeg-5.1.x.patch
new file mode 100644
index 0000000..3f99cae
--- /dev/null
+++ b/chromium-151-el9-ffmpeg-5.1.x.patch
@@ -0,0 +1,136 @@
+diff -up chromium-151.0.7922.47/media/ffmpeg/ffmpeg_common.cc.el9-ffmpeg-5.1.x chromium-151.0.7922.47/media/ffmpeg/ffmpeg_common.cc
+--- chromium-151.0.7922.47/media/ffmpeg/ffmpeg_common.cc.el9-ffmpeg-5.1.x	2026-07-28 09:45:19.770842992 +0200
++++ chromium-151.0.7922.47/media/ffmpeg/ffmpeg_common.cc	2026-07-28 10:23:29.074215304 +0200
+@@ -770,8 +770,13 @@ bool AVStreamToVideoDecoderConfig(const
+ 
+   VideoTransformation video_transformation = VideoTransformation();
+   VideoSpatialFormat spatial_format;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
++  for (int i = 0; i < stream->nb_side_data; i++) {
++    const auto& side_data = stream->side_data[i];
++#else
+   for (const auto& side_data :
+        AVCodecParametersCodedSideToSpan(stream->codecpar)) {
++#endif
+     switch (side_data.type) {
+       case AV_PKT_DATA_DISPLAYMATRIX: {
+         constexpr size_t kNumElements = 3 * 3;
+diff -up chromium-151.0.7922.47/media/ffmpeg/ffmpeg_common.h.el9-ffmpeg-5.1.x chromium-151.0.7922.47/media/ffmpeg/ffmpeg_common.h
+--- chromium-151.0.7922.47/media/ffmpeg/ffmpeg_common.h.el9-ffmpeg-5.1.x	2026-07-22 01:20:22.000000000 +0200
++++ chromium-151.0.7922.47/media/ffmpeg/ffmpeg_common.h	2026-07-28 09:45:19.771816742 +0200
+@@ -119,9 +119,13 @@ inline base::span<AVPacketSideData> AVCo
+   // https://ffmpeg.org/doxygen/trunk/structAVCodecParameters.html#a29643cfd94231e2d148a5d17b08d115b
+   // ffmpeg documentation: `nb_coded_side_data` is the amount of entries in
+   // `coded_side_data`.
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 31, 102)
+   return UNSAFE_BUFFERS(
+       base::span(codecpar->coded_side_data,
+                  base::checked_cast<size_t>(codecpar->nb_coded_side_data)));
++#else
++   return base::span<AVPacketSideData>();
++#endif
+ }
+ 
+ inline base::span<uint8_t> AVCodecParametersExtraDataToSpan(
+diff -up chromium-151.0.7922.47/media/filters/audio_video_metadata_extractor.cc.el9-ffmpeg-5.1.x chromium-151.0.7922.47/media/filters/audio_video_metadata_extractor.cc
+--- chromium-151.0.7922.47/media/filters/audio_video_metadata_extractor.cc.el9-ffmpeg-5.1.x	2026-07-22 01:20:22.000000000 +0200
++++ chromium-151.0.7922.47/media/filters/audio_video_metadata_extractor.cc	2026-07-28 09:45:19.771952981 +0200
+@@ -109,17 +109,33 @@ bool AudioVideoMetadataExtractor::Extrac
+   container_info.type = format_context->iformat->name;
+   ExtractDictionary(format_context->metadata, &container_info.tags);
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
++  for (unsigned int i = 0; i < format_context->nb_streams; ++i) {
++    stream_infos_.push_back(StreamInfo());
++#else
+   base::span<AVStream*> format_context_span =
+       AVFormatContextToSpan(format_context);
+   std::ranges::for_each(format_context_span, [&](AVStream* stream) {
+     stream_infos_.emplace_back();
++#endif
+     StreamInfo& info = stream_infos_.back();
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
++    AVStream* stream = format_context->streams[i];
++    if (!stream)
++      continue;
++#else
+     if (!stream) {
+       return;
+     }
++#endif
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
++    for (int j = 0; j < stream->nb_side_data; j++) {
++      const AVPacketSideData& sd = stream->side_data[j];
++#else
+     for (const auto& sd : AVCodecParametersCodedSideToSpan(stream->codecpar)) {
++#endif
+       if (sd.type == AV_PKT_DATA_DISPLAYMATRIX) {
+         constexpr size_t kNumElements = 3 * 3;
+         CHECK_EQ(sd.size, sizeof(int32_t) * kNumElements);
+@@ -143,7 +159,11 @@ bool AudioVideoMetadataExtractor::Extrac
+     ExtractDictionary(stream->metadata, &info.tags);
+ 
+     if (!stream->codecpar) {
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
++      continue;
++#else
+       return;
++#endif
+     }
+ 
+     info.type = avcodec_get_name(stream->codecpar->codec_id);
+@@ -166,7 +186,11 @@ bool AudioVideoMetadataExtractor::Extrac
+           reinterpret_cast<const char*>(stream->attached_pic.data),
+           stream->attached_pic.size);
+     }
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
++  }
++#else
+   });
++#endif
+ 
+   extracted_ = true;
+   return true;
+diff -up chromium-151.0.7922.47/media/filters/media_file_checker.cc.el9-ffmpeg-5.1.x chromium-151.0.7922.47/media/filters/media_file_checker.cc
+--- chromium-151.0.7922.47/media/filters/media_file_checker.cc.el9-ffmpeg-5.1.x	2026-07-22 01:20:22.000000000 +0200
++++ chromium-151.0.7922.47/media/filters/media_file_checker.cc	2026-07-28 09:45:19.772063149 +0200
+@@ -64,6 +64,10 @@ bool MediaFileChecker::Start(base::TimeD
+   // Remember the codec context for any decodable audio or video streams.
+   bool found_streams = false;
+   std::vector<Decoder> stream_contexts(format_context->nb_streams);
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
++  for (size_t i = 0; i < format_context->nb_streams; ++i) {
++    AVCodecParameters* cp = format_context->streams[i]->codecpar;
++#else
+   base::span<AVStream*> format_context_span =
+       AVFormatContextToSpan(format_context);
+   std::ranges::transform(
+@@ -85,9 +89,26 @@ bool MediaFileChecker::Start(base::TimeD
+           }
+         }
+ 
++#endif
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
++    if (cp->codec_type == AVMEDIA_TYPE_AUDIO ||
++        cp->codec_type == AVMEDIA_TYPE_VIDEO) {
++      auto context = AVStreamToAVCodecContext(format_context->streams[i]);
++      if (!context)
++        continue;
++      const AVCodec* codec = avcodec_find_decoder(cp->codec_id);
++      if (codec && avcodec_open2(context.get(), codec, nullptr) >= 0) {
++        auto loop = std::make_unique<FFmpegDecodingLoop>(context.get());
++        stream_contexts[i] = {std::move(context), std::move(loop)};
++        found_streams = true;
++      }
++    }
++  }
++#else
+         return Decoder{};
+       });
+ 
++#endif
+   if (!found_streams)
+     return false;
+ 

diff --git a/chromium-151-histograms_xml-build-error.patch b/chromium-151-histograms_xml-build-error.patch
new file mode 100644
index 0000000..05579ff
--- /dev/null
+++ b/chromium-151-histograms_xml-build-error.patch
@@ -0,0 +1,12 @@
+diff -up chromium-151.0.7922.47/tools/metrics/BUILD.gn.me chromium-151.0.7922.47/tools/metrics/BUILD.gn
+--- chromium-151.0.7922.47/tools/metrics/BUILD.gn.me	2026-07-27 17:51:17.673099530 +0200
++++ chromium-151.0.7922.47/tools/metrics/BUILD.gn	2026-07-27 17:52:04.590805146 +0200
+@@ -11,7 +11,7 @@ import("//tools/metrics/histograms/histo
+ # dirmd doesn't work in non-git checkout.
+ # TODO(crbug.com/329080012): Remove this once dirmd works in non-git
+ # checkouts.
+-if (path_exists("//.git")) {
++if (generate_location_tags) {
+   action("histograms_xml") {
+     script = "histograms/merge_xml.py"
+     output = "$root_out_dir/histograms.xml"

diff --git a/chromium-151-system-golang.patch b/chromium-151-system-golang.patch
new file mode 100644
index 0000000..87e6f8f
--- /dev/null
+++ b/chromium-151-system-golang.patch
@@ -0,0 +1,15 @@
+Replace bundle golang with system golang
+
+diff -up chromium-151.0.7922.47/third_party/dawn/tools/generate-sources-gn.py.me chromium-151.0.7922.47/third_party/dawn/tools/generate-sources-gn.py
+--- chromium-151.0.7922.47/third_party/dawn/tools/generate-sources-gn.py.me	2026-07-27 18:03:28.552230049 +0200
++++ chromium-151.0.7922.47/third_party/dawn/tools/generate-sources-gn.py	2026-07-27 18:04:21.360395992 +0200
+@@ -40,8 +40,7 @@ from tools.python import cipd_deps
+ 
+ 
+ def main() -> int:
+-    go_binary = os.path.join(DAWN_ROOT, 'tools', 'golang',
+-                             cipd_deps.get_cipd_platform(), 'bin', 'go')
++    go_binary = "go"
+     if sys.platform == 'win32':
+         go_binary += '.exe'
+ 

diff --git a/chromium.spec b/chromium.spec
index f77a55d..db2844d 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -271,7 +271,7 @@
 %endif
 
 Name:	chromium
-Version: 150.0.7871.186
+Version: 151.0.7922.71
 Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
@@ -334,7 +334,7 @@ Patch131: chromium-107-proprietary-codecs.patch
 # fix tab crash with SIGTRAP error when using system ffmpeg
 Patch132: chromium-118-sigtrap_system_ffmpeg.patch
 # need for old ffmpeg 6.0/5.x on epel9 and fedora < 40
-Patch133: chromium-142-el9-ffmpeg-5.1.x.patch
+Patch133: chromium-151-el9-ffmpeg-5.1.x.patch
 # revert, it causes build error: use of undeclared identifier 'AVFMT_FLAG_NOH264PARSE'
 Patch135: chromium-133-disable-H.264-video-parser-during-demuxing.patch
 # Workaround for youtube stop working
@@ -400,10 +400,8 @@ Patch315: chromium-145-rustc-ftbfs.patch
 
 # llvm <= 22
 # clang++: error: unknown argument: '-fno-lifetime-dse'
-Patch316: chromium-149-clang++-unknown-argument.patch
-
 # unknown warning option -Wno-nontrivial-memcall
-Patch317: chromium-142-clang++-unknown-argument.patch
+Patch316: chromium-151-clang++-unknown-argument.patch
 
 Patch318: memory-allocator-dcheck-assert-fix.patch
 
@@ -413,6 +411,12 @@ Patch319: chromium-143-swiftshader-llvm-16.0.patch
 # Fix build error on fedora aarch64
 Patch320: chromium-149-aarch64-log-error.patch
 
+# Replace with system golang
+Patch321: chromium-151-system-golang.patch
+
+# Fix build error caused by Unresolved dependencies
+Patch322: chromium-151-histograms_xml-build-error.patch
+
 # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2239523
 # https://bugs.chromium.org/p/chromium/issues/detail?id=1145581#c60
 # Disable BTI until this is fixed upstream.
@@ -481,7 +485,6 @@ Patch399: 0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch
 Patch401: fix-rustc.patch
 Patch402: fix-rust-linking.patch
 Patch403: fix-breakpad-compile.patch
-Patch404: fix-partition-alloc-compile.patch
 Patch405: fix-study-crash.patch
 Patch407: fix-different-data-layouts.patch
 Patch408: 0002-Add-ppc64-trap-instructions.patch
@@ -522,13 +525,7 @@ Patch520: build-with-wasm-rollup.patch
 Patch521: disable-ai.patch
 
 # Upstream patches
-Patch600: chromium-150-sysroot.patch
-Patch601: chromium-150-Omit-ar-from-inputs-when-resolved-via-PATH.patch
-Patch602: chromium-150-Fix-get_path_info-on-empty-ar-in-unbundle-toolchain.patch
 # Darkmode
-Patch603: chromium-150-Add-AutoDarkModeSkipImages-flag-to-bypass-image-dark-mode.patch
-Patch604: chromium-150-Make-dark-mode-apply-filter-to-images-irrespective-of-layout-zoom.patch
-Patch605: chromium-150-Use-64px-css-pixels-absolute-threshold-for-dark-image-classification.patch
 Patch606: chromium-150-Add-size-threshold-for-classifying-SVG-documents-for-auto-dark-mode.patch
 Patch607: chromium-150-Add-AutoDarkModeSVGSizeThreshold-kill-switch-flag.patch
 
@@ -564,6 +561,7 @@ Source13: nodejs-sources.sh
 BuildRequires: openssl-devel
 %endif
 
+BuildRequires: golang
 BuildRequires: clang
 BuildRequires: clang-tools-extra
 BuildRequires: llvm
@@ -1157,10 +1155,6 @@ Qt6 UI for chromium.
 
 %patch -P316 -p1 -b .clang++-unknown-argument
 
-%if 0%{?fedora} && 0%{?fedora} < 42 || 0%{?rhel} && 0%{?rhel} < 10
-%patch -P317 -p1 -b .clang++-unsupported-argument
-%endif
-
 %patch -P318 -p1 -b .memory-allocator-dcheck-assert-fix
 %patch -P319 -p1 -b .swiftshader-llvm-16.0
 
@@ -1168,6 +1162,9 @@ Qt6 UI for chromium.
 %patch -P320 -p1 -b .aarch64-log-error
 %endif
 
+%patch -P321 -p1 -b .system-golang
+%patch -P322 -p1 -b .histograms_xml-build-error
+
 %if %{disable_bti}
 %patch -P352 -p1 -b .workaround_for_crash_on_BTI_capable_system
 %endif
@@ -1216,7 +1213,6 @@ Qt6 UI for chromium.
 %patch -P401 -p1 -b .fix-rustc
 %patch -P402 -p1 -b .fix-rust-linking
 %patch -P403 -p1 -b .fix-breakpad-compile
-%patch -P404 -p1 -b .fix-partition-alloc-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
@@ -1243,13 +1239,6 @@ Qt6 UI for chromium.
 %patch -P521 -p1 -b .disable-ai
 
 # Upstream patches
-%patch -P600 -p1 -b .sysroot
-%patch -P601 -p1 -b .Omit-ar-from-inputs-when-resolved-via-PATH
-%patch -P602 -p1 -b .Fix-get_path_info-on-empty-ar-in-unbundle-toolchain
-# Darkmode
-%patch -P603 -p1 -b .Add-AutoDarkModeSkipImages-flag-to-bypass-image-dark-mode
-%patch -P604 -p1 -b .Make-dark-mode-apply-filter-to-images-irrespective-of-layout-zoom
-%patch -P605 -p1 -b .Use-64px-css-pixels-absolute-threshold-for-dark-image-classification
 %patch -P606 -p1 -b .Add-size-threshold-for-classifying-SVG-documents-for-auto-dark-mode
 %patch -P607 -p1 -b .Add-AutoDarkModeSVGSizeThreshold-kill-switch-flag
 
@@ -1922,6 +1911,379 @@ fi
 %endif
 
 %changelog
+* Thu Jul 30 2026 Than Ngo <than@redhat.com> - 151.0.7922.71-1
+- Update to 151.0.7922.71
+  * CVE-2026-17650: Use after free in Compositing
+  * CVE-2026-17651: Insufficient validation of untrusted input in Dawn
+  * CVE-2026-17652: Use after free in Views
+  * CVE-2026-17653: Use after free in Skia
+  * CVE-2026-17654: Race in Updater
+  * CVE-2026-17655: Insufficient validation of untrusted input in ANGLE
+  * CVE-2026-17656: Use after free in Ozone
+  * CVE-2026-17657: Use after free in Navigation
+  * CVE-2026-17658: Use after free in V8
+  * CVE-2026-17659: Inappropriate implementation in SiteIsolation
+  * CVE-2026-17660: Insufficient validation of untrusted input in Network
+  * CVE-2026-17661: Use after free in Loader
+  * CVE-2026-17662: Insufficient policy enforcement in Prefetch
+  * CVE-2026-17663: Insufficient validation of untrusted input in GPU
+  * CVE-2026-17664: Insufficient validation of untrusted input in Loader
+  * CVE-2026-17665: Use after free in V8
+  * CVE-2026-17666: Cryptographic Flaw in Enterprise
+  * CVE-2026-17667: Uninitialized Use in ANGLE
+  * CVE-2026-17668: Uninitialized Use in ANGLE
+  * CVE-2026-17669: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17670: Use after free in Views
+  * CVE-2026-17671: Insufficient validation of untrusted input in ANGLE
+  * CVE-2026-17672: Insufficient validation of untrusted input in Chromecast
+  * CVE-2026-17673: Integer overflow in QUIC
+  * CVE-2026-17674: Inappropriate implementation in HTML
+  * CVE-2026-17675: Out of bounds write in ANGLE
+  * CVE-2026-17676: Inappropriate implementation in ANGLE
+  * CVE-2026-17677: Inappropriate implementation in ANGLE
+  * CVE-2026-17678: Out of bounds read in ANGLE
+  * CVE-2026-17679: Insufficient validation of untrusted input in Print Preview
+  * CVE-2026-17680: Heap buffer overflow in Color
+  * CVE-2026-17681: Insufficient validation of untrusted input in Web Authentication
+  * CVE-2026-17682: Integer overflow in ANGLE
+  * CVE-2026-17683: Inappropriate implementation in ANGLE
+  * CVE-2026-17684: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-17685: Use after free in Autofill
+  * CVE-2026-17686: Insufficient validation of untrusted input in Passwords
+  * CVE-2026-17687: Type Confusion in ANGLE
+  * CVE-2026-17688: Use after free in Input
+  * CVE-2026-17689: Uninitialized Use in ANGLE
+  * CVE-2026-17690: Insufficient validation of untrusted input in PDF
+  * CVE-2026-17691: Out of bounds write in ANGLE
+  * CVE-2026-17692: Use after free in DataTransfer
+  * CVE-2026-17693: Inappropriate implementation in FileSystem
+  * CVE-2026-17694: Use after free in DOM
+  * CVE-2026-17695: Inappropriate implementation in ANGLE
+  * CVE-2026-17696: Side-channel information leakage in Media
+  * CVE-2026-17697: Type Confusion in ANGLE
+  * CVE-2026-17698: Insufficient validation of untrusted input in UI
+  * CVE-2026-17699: Use after free in Views
+  * CVE-2026-17700: Insufficient validation of untrusted input in Actor
+  * CVE-2026-17701: Out of bounds read in ANGLE
+  * CVE-2026-17702: Inappropriate implementation in Skia
+  * CVE-2026-17703: Policy bypass in Chrome for iOS
+  * CVE-2026-17704: Use after free in ANGLE
+  * CVE-2026-17705: Integer overflow in libxml
+  * CVE-2026-17706: Insufficient validation of untrusted input in Media
+  * CVE-2026-17707: Uninitialized Use in Media
+  * CVE-2026-17708: Use after free in Audio
+  * CVE-2026-17709: Race in Downloads
+  * CVE-2026-17710: Inappropriate implementation in MHTML
+  * CVE-2026-17711: Race in Downloads
+  * CVE-2026-17712: Race in Skia
+  * CVE-2026-17713: Insufficient validation of untrusted input in Accessibility
+  * CVE-2026-17714: Uninitialized Use in ANGLE
+  * CVE-2026-17715: Inappropriate implementation in Passwords
+  * CVE-2026-17716: Use after free in Updater
+  * CVE-2026-17717: Integer overflow in ANGLE
+  * CVE-2026-17718: Use after free in ANGLE
+  * CVE-2026-17719: Use after free in Input
+  * CVE-2026-17720: Insufficient policy enforcement in Passwords
+  * CVE-2026-17721: Out of bounds write in ANGLE
+  * CVE-2026-17722: Object lifecycle issue in WebView
+  * CVE-2026-17723: Use after free in Media
+  * CVE-2026-17724: Race in Chrome for iOS
+  * CVE-2026-17725: Type Confusion in V8
+  * CVE-2026-17726: Integer overflow in WebGL
+  * CVE-2026-17727: Out of bounds write in WebGL
+  * CVE-2026-17728: Inappropriate implementation in Extensions
+  * CVE-2026-17758: Heap buffer overflow in Dawn
+  * CVE-2026-17732: Inappropriate implementation in SVG
+  * CVE-2026-17729: Use after free in V8
+  * CVE-2026-17730: Side-channel information leakage in Autofill
+  * CVE-2026-17731: Inappropriate implementation in Autofill
+  * CVE-2026-17733: Inappropriate implementation in QUIC
+  * CVE-2026-17734: Inappropriate implementation in Autofill
+  * CVE-2026-17735: Insufficient validation of untrusted input in BFCache
+  * CVE-2026-17736: Insufficient validation of untrusted input in WebView
+  * CVE-2026-17737: Use after free in Bluetooth
+  * CVE-2026-17738: Insufficient validation of untrusted input in Payments
+  * CVE-2026-17739: Insufficient policy enforcement in Extensions
+  * CVE-2026-17740: Uninitialized Use in ANGLE
+  * CVE-2026-17741: Insufficient validation of untrusted input in WebView
+  * CVE-2026-17742: Insufficient policy enforcement in Payments
+  * CVE-2026-17743: Insufficient policy enforcement in ControlledFrame
+  * CVE-2026-17744: Inappropriate implementation in File Input
+  * CVE-2026-17745: Out of bounds read in Skia
+  * CVE-2026-17746: Use after free in GPU
+  * CVE-2026-17747: Insufficient validation of untrusted input in Payments
+  * CVE-2026-17748: Inappropriate implementation in Extensions
+  * CVE-2026-17749: Insufficient validation of untrusted input in Extensions
+  * CVE-2026-17750: Use after free in ANGLE
+  * CVE-2026-17751: Inappropriate implementation in AdFilter
+  * CVE-2026-17752: Use after free in Views
+  * CVE-2026-17753: Inappropriate implementation in Autofill
+  * CVE-2026-17754: Inappropriate implementation in Blink
+  * CVE-2026-17755: Incorrect security UI in Extensions
+  * CVE-2026-17756: Insufficient policy enforcement in Presentation
+  * CVE-2026-17757: Uninitialized Use in Skia
+  * CVE-2026-17759: Uninitialized Use in Codecs
+  * CVE-2026-17760: Side-channel information leakage in NoStatePrefetch
+  * CVE-2026-17761: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-17762: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17763: Inappropriate implementation in GPU
+  * CVE-2026-17764: Inappropriate implementation in FedCM
+  * CVE-2026-17765: Inappropriate implementation in WebProtect
+  * CVE-2026-17766: Insufficient validation of untrusted input in Clipboard
+  * CVE-2026-17767: Insufficient validation of untrusted input in WebView
+  * CVE-2026-17768: Insufficient validation of untrusted input in WebSockets
+  * CVE-2026-17769: Insufficient validation of untrusted input in Cast
+  * CVE-2026-17770: Out of bounds read in Media
+  * CVE-2026-17771: Uninitialized Use in Skia
+  * CVE-2026-17772: Out of bounds read in WebGL
+  * CVE-2026-17773: Insufficient validation of untrusted input in Cast
+  * CVE-2026-17774: Insufficient validation of untrusted input in Variations
+  * CVE-2026-17775: Inappropriate implementation in PresentationAPI
+  * CVE-2026-17776: Policy bypass in Receiver
+  * CVE-2026-17777: Inappropriate implementation in Autofill
+  * CVE-2026-17778: Use after free in Extensions
+  * CVE-2026-17779: Inappropriate implementation in Site Isolation
+  * CVE-2026-17780: Inappropriate implementation in Isolated Web Apps
+  * CVE-2026-17781: Inappropriate implementation in Extensions
+  * CVE-2026-17782: Incorrect security UI in Chrome for iOS
+  * CVE-2026-17783: Inappropriate implementation in Loader
+  * CVE-2026-17784: Use after free in Audio
+  * CVE-2026-17785: Uninitialized Use in ANGLE
+  * CVE-2026-17786: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-17787: Inappropriate implementation in DevTools
+  * CVE-2026-17788: Inappropriate implementation in Blink
+  * CVE-2026-17789: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-17790: Uninitialized Use in ANGLE
+  * CVE-2026-17791: Insufficient validation of untrusted input in Payments
+  * CVE-2026-17792: Inappropriate implementation in Credential Management
+  * CVE-2026-17793: Inappropriate implementation in Messages
+  * CVE-2026-17794: Insufficient validation of untrusted input in Mobile
+  * CVE-2026-17795: Insufficient validation of untrusted input in GetUserMedia
+  * CVE-2026-17796: Side-channel information leakage in WebXR
+  * CVE-2026-17797: Inappropriate implementation in CSS
+  * CVE-2026-17798: Inappropriate implementation in Cast
+  * CVE-2026-17799: Insufficient validation of untrusted input in Safe Browsing
+  * CVE-2026-17800: Side-channel information leakage in MediaRecording
+  * CVE-2026-17801: Out of bounds memory access in ANGLE
+  * CVE-2026-17802: Side-channel information leakage in GPU
+  * CVE-2026-17803: Insufficient validation of untrusted input in Save to Drive
+  * CVE-2026-17804: Use after free in Media
+  * CVE-2026-17805: Insufficient policy enforcement in Glic
+  * CVE-2026-17806: Insufficient validation of untrusted input in Extensions
+  * CVE-2026-17807: Use after free in V8
+  * CVE-2026-17808: Uninitialized Use in WebGL
+  * CVE-2026-17809: Insufficient validation of untrusted input in Extensions
+  * CVE-2026-17810: Uninitialized Use in Dawn
+  * CVE-2026-17811: Use after free in ANGLE
+  * CVE-2026-17812: Inappropriate implementation in DigitalCredentials
+  * CVE-2026-17813: Insufficient policy enforcement in Chrome for iOS
+  * CVE-2026-17814: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-17815: Insufficient policy enforcement in GuestView
+  * CVE-2026-17816: Inappropriate implementation in Speech
+  * CVE-2026-17817: Inappropriate implementation in ReportingAndNEL
+  * CVE-2026-17818: Inappropriate implementation in Network
+  * CVE-2026-17819: Inappropriate implementation in WebAppInstalls
+  * CVE-2026-17820: Insufficient policy enforcement in Autofill
+  * CVE-2026-17821: Insufficient policy enforcement in Extensions
+  * CVE-2026-17822: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17823: Insufficient policy enforcement in WebXR
+  * CVE-2026-17824: Insufficient policy enforcement in ServiceWorker
+  * CVE-2026-17825: Insufficient policy enforcement in Passwords
+  * CVE-2026-17826: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17827: Inappropriate implementation in CSS
+  * CVE-2026-17828: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17829: Insufficient policy enforcement in Passwords
+  * CVE-2026-17830: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17831: Insufficient validation of untrusted input in Passwords
+  * CVE-2026-17832: Use after free in ANGLE
+  * CVE-2026-17833: Inappropriate implementation in Passwords
+  * CVE-2026-17834: Inappropriate implementation in Passwords
+  * CVE-2026-17835: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17836: Use after free in V8
+  * CVE-2026-17837: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-17838: Incorrect security UI in Chrome for iOS
+  * CVE-2026-17839: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17840: Incorrect security UI in Passwords
+  * CVE-2026-17841: Race in Chrome for iOS
+  * CVE-2026-17842: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17843: Inappropriate implementation in CSS
+  * CVE-2026-17844: Insufficient validation of untrusted input in Cast
+  * CVE-2026-17845: Inappropriate implementation in CSS
+  * CVE-2026-17846: Inappropriate implementation in Media
+  * CVE-2026-17847: Insufficient validation of untrusted input in ANGLE
+  * CVE-2026-17848: Insufficient validation of untrusted input in Codecs
+  * CVE-2026-17849: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17850: Inappropriate implementation in Permissions
+  * CVE-2026-17851: Side-channel information leakage in Autofill
+  * CVE-2026-17852: Inappropriate implementation in Media Router
+  * CVE-2026-17853: Inappropriate implementation in DevTools
+  * CVE-2026-17854: Insufficient policy enforcement in WebMCP
+  * CVE-2026-17855: Race in DevTools
+  * CVE-2026-17856: Inappropriate implementation in Network
+  * CVE-2026-17857: Inappropriate implementation in Network
+  * CVE-2026-17858: Uninitialized Use in WebNN
+  * CVE-2026-17859: Side-channel information leakage in Favicons
+  * CVE-2026-17860: Insufficient validation of untrusted input in Mobile
+  * CVE-2026-17861: Insufficient validation of untrusted input in Updater
+  * CVE-2026-17862: Use after free in Tracing
+  * CVE-2026-17863: Inappropriate implementation in Browser
+  * CVE-2026-17864: Inappropriate implementation in Updater
+  * CVE-2026-17865: Inappropriate implementation in Crypto
+  * CVE-2026-17866: Type Confusion in Tab
+  * CVE-2026-17867: Insufficient validation of untrusted input in Dawn
+  * CVE-2026-17868: Insufficient policy enforcement in USB
+  * CVE-2026-17869: Out of bounds read in WebXR
+  * CVE-2026-17870: Insufficient validation of untrusted input in Cast
+  * CVE-2026-17871: Inappropriate implementation in Passwords
+  * CVE-2026-17872: Cryptographic Flaw in WebAppInstalls
+  * CVE-2026-17873: Insufficient policy enforcement in Chrome for iOS
+  * CVE-2026-17874: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17875: Use after free in PDFium
+  * CVE-2026-17876: Inappropriate implementation in Payments
+  * CVE-2026-17877: Inappropriate implementation in Chromoting
+  * CVE-2026-17878: Inappropriate implementation in CSS
+  * CVE-2026-17879: Inappropriate implementation in Autofill
+  * CVE-2026-17880: Inappropriate implementation in Autofill
+  * CVE-2026-17881: Use after free in WebXR
+  * CVE-2026-17882: Policy bypass in Extensions
+  * CVE-2026-17883: Inappropriate implementation in Headless
+  * CVE-2026-17884: Object lifecycle issue in WebRTC
+  * CVE-2026-17885: Inappropriate implementation in Paint
+  * CVE-2026-17886: Use after free in Enterprise
+  * CVE-2026-17887: Use after free in TabStrip
+  * CVE-2026-17888: Insufficient validation of untrusted input in WebUI
+  * CVE-2026-17889: Uninitialized Use in WebXR
+  * CVE-2026-17890: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-17891: Use after free in ANGLE
+  * CVE-2026-17892: Inappropriate implementation in WebXR
+  * CVE-2026-17893: Insufficient validation of untrusted input in Updater
+  * CVE-2026-17894: Use after free in Views
+  * CVE-2026-17895: Inappropriate implementation in DataTransfer
+  * CVE-2026-17896: Use after free in DevTools
+  * CVE-2026-17897: Inappropriate implementation in ORB
+  * CVE-2026-17898: Use after free in DevTools
+  * CVE-2026-17899: Insufficient policy enforcement in DevTools
+  * CVE-2026-17900: Inappropriate implementation in Enterprise
+  * CVE-2026-17901: Inappropriate implementation in Sharing
+  * CVE-2026-17902: Inappropriate implementation in Editing
+  * CVE-2026-17903: Insufficient policy enforcement in Chromecast
+  * CVE-2026-17904: Insufficient policy enforcement in NFC
+  * CVE-2026-17905: Inappropriate implementation in SurfaceCapture
+  * CVE-2026-17906: Insufficient validation of untrusted input in Bluetooth
+  * CVE-2026-17907: Side-channel information leakage in Network
+  * CVE-2026-17908: Insufficient validation of untrusted input in Printing
+  * CVE-2026-17909: Insufficient validation of untrusted input in Isolated Web Apps
+  * CVE-2026-17910: Insufficient policy enforcement in NFC
+  * CVE-2026-17911: Insufficient policy enforcement in SVG
+  * CVE-2026-17912: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17913: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17914: Side-channel information leakage in Skia
+  * CVE-2026-17915: Inappropriate implementation in WebView
+  * CVE-2026-17916: Insufficient policy enforcement in Settings
+  * CVE-2026-17917: Policy bypass in Chrome for iOS
+  * CVE-2026-17918: Use after free in Sync
+  * CVE-2026-17919: Insufficient policy enforcement in Enterprise
+  * CVE-2026-17920: Use after free in V8
+  * CVE-2026-17921: Insufficient validation of untrusted input in Navigation
+  * CVE-2026-17922: Inappropriate implementation in Enterprise
+  * CVE-2026-17923: Policy bypass in Enterprise
+  * CVE-2026-17924: Use after free in DNS
+  * CVE-2026-17925: Inappropriate implementation in Cast
+  * CVE-2026-17926: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-17927: Insufficient policy enforcement in DevTools
+  * CVE-2026-17928: Inappropriate implementation in DataTransfer
+  * CVE-2026-17929: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-17930: Insufficient validation of untrusted input in Extensions
+  * CVE-2026-17931: Inappropriate implementation in DevTools
+  * CVE-2026-17932: Use after free in DataTransfer
+  * CVE-2026-17933: Inappropriate implementation in DOMStorage
+  * CVE-2026-17934: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-17935: Heap buffer overflow in Codecs
+  * CVE-2026-17936: Inappropriate implementation in DevTools
+  * CVE-2026-17937: Inappropriate implementation in DevTools
+  * CVE-2026-17938: Inappropriate implementation in FullScreen
+  * CVE-2026-17939: Inappropriate implementation in Passwords
+  * CVE-2026-17940: Insufficient validation of untrusted input in Picture-in-Picture
+  * CVE-2026-17941: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17942: Side-channel information leakage in SVG
+  * CVE-2026-17943: Inappropriate implementation in Parser
+  * CVE-2026-17944: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17945: Inappropriate implementation in Navigation
+  * CVE-2026-17946: Uninitialized Use in Dawn
+  * CVE-2026-17947: Use after free in WebSockets
+  * CVE-2026-17948: Type Confusion in V8
+  * CVE-2026-17949: Uninitialized Use in GPU
+  * CVE-2026-17950: Policy bypass in Safebrowsing
+  * CVE-2026-17951: Heap buffer overflow in WebRTC
+  * CVE-2026-17952: Inappropriate implementation in V8
+  * CVE-2026-17953: Insufficient policy enforcement in WebView
+  * CVE-2026-17954: Policy bypass in MHTML
+  * CVE-2026-17955: Insufficient validation of untrusted input in Payments
+  * CVE-2026-17956: Inappropriate implementation in Scheduling
+  * CVE-2026-17957: Inappropriate implementation in CORS
+  * CVE-2026-17958: Inappropriate implementation in Views
+  * CVE-2026-17959: Inappropriate implementation in Network
+  * CVE-2026-17960: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17961: Inappropriate implementation in Session
+  * CVE-2026-17962: Inappropriate implementation in Blink
+  * CVE-2026-17963: Inappropriate implementation in SVG
+  * CVE-2026-17964: Incorrect security UI in UI
+  * CVE-2026-17965: Incorrect security UI in Chrome for iOS
+  * CVE-2026-17966: Inappropriate implementation in Views
+  * CVE-2026-17967: Use after free in Chrome for iOS
+  * CVE-2026-17968: Uninitialized Use in WebXR
+  * CVE-2026-17969: Inappropriate implementation in Passwords
+  * CVE-2026-17970: Insufficient validation of untrusted input in Passwords
+  * CVE-2026-17971: Inappropriate implementation in Frame
+  * CVE-2026-17972: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-17973: Inappropriate implementation in Views
+  * CVE-2026-17974: Insufficient policy enforcement in DevTools
+  * CVE-2026-17975: Inappropriate implementation in IME
+  * CVE-2026-17976: Policy bypass in Extensions
+  * CVE-2026-17977: Policy bypass in CSS
+  * CVE-2026-17978: Side-channel information leakage in WebCodecs
+  * CVE-2026-17979: Race in V8
+  * CVE-2026-17980: Inappropriate implementation in UI
+  * CVE-2026-17981: Inappropriate implementation in Blink
+  * CVE-2026-17982: Insufficient validation of untrusted input in Cast
+  * CVE-2026-17983: Incorrect security UI in Global Media Controls
+  * CVE-2026-17984: Inappropriate implementation in Browser
+  * CVE-2026-17985: Insufficient policy enforcement in Speech
+  * CVE-2026-17986: Insufficient policy enforcement in Bluetooth
+  * CVE-2026-17987: Insufficient validation of untrusted input in Notifications
+  * CVE-2026-17988: Insufficient validation of untrusted input in Navigation
+  * CVE-2026-17989: Type Confusion in V8
+  * CVE-2026-17990: Insufficient validation of untrusted input in WebAuthn
+  * CVE-2026-17991: Insufficient validation of untrusted input in AI
+  * CVE-2026-17992: Uninitialized Use in Skia
+  * CVE-2026-17993: Race in Updater
+  * CVE-2026-17994: Inappropriate implementation in Media
+  * CVE-2026-17995: Out of bounds read in Dawn
+  * CVE-2026-17996: Inappropriate implementation in Browser
+  * CVE-2026-17997: Inappropriate implementation in Passwords
+  * CVE-2026-17998: Incorrect security UI in Extensions
+  * CVE-2026-17999: Incorrect security UI in PictureInPicture
+  * CVE-2026-18000: Insufficient policy enforcement in USB
+  * CVE-2026-18001: Inappropriate implementation in WebGL
+  * CVE-2026-18002: Insufficient validation of untrusted input in Google Lens
+  * CVE-2026-18003: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-18004: Insufficient policy enforcement in Speech
+  * CVE-2026-18005: Inappropriate implementation in WebXR
+  * CVE-2026-18006: Inappropriate implementation in Google Lens
+  * CVE-2026-18007: Inappropriate implementation in Input
+  * CVE-2026-18008: Inappropriate implementation in Settings
+  * CVE-2026-18009: Insufficient validation of untrusted input in Passwords
+  * CVE-2026-18010: Inappropriate implementation in Passwords
+  * CVE-2026-18011: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-18012: Use after free in PDFium
+  * CVE-2026-18013: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-18014: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-18015: Inappropriate implementation in Tint
+  * CVE-2026-18016: Insufficient policy enforcement in Chrome for iOS
+  * CVE-2026-18017: Use after free in Dawn
+  * CVE-2026-18018: Inappropriate implementation in Updater
+  * CVE-2026-18019: Side-channel information leakage in Media
+
 * Fri Jul 24 2026 Than Ngo <than@redhat.com> - 150.0.7871.186-1
 - Update to 150.0.7871.186
   * CVE-2026-16807: Out of bounds write in Codecs

diff --git a/disable-ai.patch b/disable-ai.patch
index b18739b..93e42da 100644
--- a/disable-ai.patch
+++ b/disable-ai.patch
@@ -1,9 +1,9 @@
 # Disable Glic ("Gemini Live in Chrome"), ScreenAI, and associated AI-based
-# features
+# features.
 
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2822,8 +2822,6 @@ static_library("browser") {
+@@ -3115,8 +3115,6 @@ source_set("browser") {
        "//chrome/app:command_ids",
        "//chrome/app/theme:chrome_unscaled_resources_grit",
        "//chrome/app/vector_icons",
@@ -12,7 +12,7 @@
        "//chrome/browser/accessibility_annotator/content_annotator",
        "//chrome/browser/actor/ui",
        "//chrome/browser/actor/ui:actor_overlay",
-@@ -2874,11 +2872,6 @@ static_library("browser") {
+@@ -3167,11 +3165,6 @@ source_set("browser") {
        "//chrome/browser/profile_resetter:impl",
        "//chrome/browser/record_replay",
        "//chrome/browser/record_replay:impl",
@@ -24,7 +24,7 @@
        "//chrome/browser/sharing/one_time_tokens",
        "//chrome/browser/sharing_hub",
        "//chrome/browser/sharing_hub:impl",
-@@ -2955,7 +2948,6 @@ static_library("browser") {
+@@ -3248,7 +3241,6 @@ source_set("browser") {
        "//chrome/browser/ui/webui:webui_util",
        "//chrome/browser/ui/webui/access_code_cast",
        "//chrome/browser/ui/webui/app_service_internals",
@@ -32,7 +32,7 @@
        "//chrome/browser/ui/webui/color_pipeline_internals",
        "//chrome/browser/ui/webui/commerce",
        "//chrome/browser/ui/webui/commerce:impl",
-@@ -3066,9 +3058,6 @@ static_library("browser") {
+@@ -3360,9 +3352,6 @@ source_set("browser") {
        "//components/webauthn/core/browser",
        "//components/webauthn/core/browser:passkey_model",
        "//services/device/public/cpp/hid",
@@ -42,7 +42,7 @@
        "//third_party/crashpad/crashpad/client:common",
        "//third_party/zxcvbn-cpp",
        "//ui/views",
-@@ -3678,7 +3667,6 @@ static_library("browser") {
+@@ -3766,7 +3755,6 @@ source_set("browser") {
        "//chrome/browser/policy:system_features_disable_list",
        "//chrome/browser/push_notification",
        "//chrome/browser/resources:app_icon_resources",
@@ -50,7 +50,7 @@
        "//chrome/browser/sharesheet",
        "//chrome/browser/sharesheet:impl",
        "//chrome/browser/support_tool/ash",
-@@ -3942,7 +3930,6 @@ static_library("browser") {
+@@ -4029,7 +4017,6 @@ source_set("browser") {
        "//remoting/host/chromeos:browser_interop",
        "//remoting/host/chromeos:features",
        "//services/device/public/cpp/geolocation",
@@ -85,7 +85,7 @@
        "//chrome/browser/ui",
        "//chrome/browser/ui/browser_window",
        "//components/live_caption:live_translate",
-@@ -240,10 +236,6 @@ if (!is_android) {
+@@ -241,10 +237,6 @@ if (!is_android) {
        deps += [ "//chrome/browser/accessibility/live_caption:test_support" ]
      }
  
@@ -122,7 +122,7 @@
  }
 --- a/chrome/browser/actor/actor_keyed_service.cc
 +++ b/chrome/browser/actor/actor_keyed_service.cc
-@@ -638,13 +638,6 @@ bool ActorKeyedService::IsActiveOnTab(co
+@@ -664,13 +664,6 @@ bool ActorKeyedService::IsActiveOnTab(co
  
  ActorTask* ActorKeyedService::GetTaskFromTab(
      const tabs::TabInterface& tab) const {
@@ -136,19 +136,9 @@
    return nullptr;
  }
  
---- a/chrome/browser/actor/ui/actor_ui_tab_controller.cc
-+++ b/chrome/browser/actor/ui/actor_ui_tab_controller.cc
-@@ -50,7 +50,6 @@ ActorUiTabController::ActorUiTabControll
-       scoped_unowned_user_data_(tab.GetUnownedUserDataHost(), *this) {
-   CHECK(base::FeatureList::IsEnabled(features::kGlicActorUi));
-   CHECK(base::FeatureList::IsEnabled(features::kGlicActor));
--  CHECK(actor_keyed_service_);
- }
- 
- ActorUiTabController::~ActorUiTabController() = default;
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -260,12 +260,10 @@ void OnLocalStatePrefsLoaded();
+@@ -259,12 +259,10 @@ void OnLocalStatePrefsLoaded();
  #if BUILDFLAG(IS_CHROMEOS)
  #include "chrome/browser/chromeos/extensions/telemetry/chromeos_telemetry_extensions_browser_api_provider.h"
  #include "chrome/browser/hid/hid_pinned_notification.h"
@@ -161,7 +151,7 @@
  #include "chrome/browser/usb/usb_status_icon.h"
  #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
  #endif
-@@ -1651,9 +1649,6 @@ void BrowserProcessImpl::PreMainMessageL
+@@ -1664,9 +1662,6 @@ void BrowserProcessImpl::PreMainMessageL
    soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -204,7 +194,7 @@
  #include "chrome/browser/web_applications/sub_apps/sub_apps_service_impl.h"
  #endif
  
-@@ -376,27 +374,6 @@ void BindMediaFoundationPreferences(
+@@ -382,27 +380,6 @@ void BindMediaFoundationPreferences(
  }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -232,7 +222,7 @@
  
  void BindModelBroker(
      content::RenderFrameHost* frame_host,
-@@ -561,10 +538,6 @@ void PopulateChromeFrameBinders(
+@@ -567,10 +544,6 @@ void PopulateChromeFrameBinders(
          &web_app::SubAppsServiceImpl::CreateIfAllowed);
    }
  
@@ -245,18 +235,19 @@
  #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
-@@ -507,8 +507,6 @@ void PopulateChromeWebUIFrameBindersPart
+@@ -516,9 +516,6 @@ void PopulateChromeWebUIFrameBindersPart
        ::mojom::app_service_internals::AppServiceInternalsPageHandler,
        AppServiceInternalsUI>(map);
  
 -  RegisterWebUIControllerInterfaceBinder<
--      ::autofill_ml_internals::mojom::PageHandler, AutofillMlInternalsUI>(map);
+-      ::autofill_ml_internals::mojom::PageHandlerFactory,
+-      AutofillMlInternalsUI>(map);
  
    RegisterWebUIControllerInterfaceBinder<
        access_code_cast::mojom::PageHandlerFactory,
 --- a/chrome/browser/component_updater/BUILD.gn
 +++ b/chrome/browser/component_updater/BUILD.gn
-@@ -204,13 +204,6 @@ source_set("impl") {
+@@ -206,13 +206,6 @@ source_set("impl") {
      ]
    }
  
@@ -272,7 +263,7 @@
      sources += [ "hyphenation_component_installer.cc" ]
 --- a/chrome/browser/component_updater/registration.cc
 +++ b/chrome/browser/component_updater/registration.cc
-@@ -53,8 +53,6 @@
+@@ -54,8 +54,6 @@
  
  #if BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.h"
@@ -281,7 +272,7 @@
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if !BUILDFLAG(IS_ANDROID)
-@@ -201,9 +199,6 @@ void RegisterComponentsForUpdate() {
+@@ -197,9 +195,6 @@ void RegisterComponentsForUpdate() {
    RegisterRealTimeUrlChecksAllowlistComponent(cus);
  #endif  // BUIDLFLAG(IS_ANDROID)
  
@@ -301,7 +292,7 @@
 -    return;
 -  }
 -  auto* focused_tab =
--      instance_->host().sharing_manager().GetFocusedTabData().focus();
+-      instance_->host().GetSharingManagerInternal().GetFocusedTabData().focus();
 -  if (!focused_tab) {
 -    instance_->host().NotifyContextualSkillsChanged({});
 -    contextual_skill_previews_.clear();
@@ -548,7 +539,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"
-@@ -501,8 +500,6 @@ ChromePermissionsClient::CreatePermissio
+@@ -525,8 +524,6 @@ ChromePermissionsClient::CreatePermissio
  #endif
    selectors.emplace_back(std::make_unique<PrefBasedQuietPermissionUiSelector>(
        Profile::FromBrowserContext(browser_context)));
@@ -557,7 +548,7 @@
    return selectors;
  }
  
-@@ -524,8 +521,6 @@ void ChromePermissionsClient::OnPromptRe
+@@ -548,8 +545,6 @@ void ChromePermissionsClient::OnPromptRe
  
    Profile* profile =
        Profile::FromBrowserContext(web_contents->GetBrowserContext());
@@ -600,7 +591,7 @@
          model_data.request_metadata.request_type;
 --- a/chrome/browser/prefs/BUILD.gn
 +++ b/chrome/browser/prefs/BUILD.gn
-@@ -371,7 +371,6 @@ source_set("impl") {
+@@ -376,7 +376,6 @@ source_set("impl") {
        "//chrome/browser/desktop_to_mobile_promos:utils",
        "//chrome/browser/device_identity",
        "//chrome/browser/new_tab_page",
@@ -610,7 +601,7 @@
        "//chrome/browser/sharing_hub",
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1573,9 +1573,6 @@ void RegisterLocalState(PrefRegistrySimp
+@@ -1643,9 +1643,6 @@ void RegisterLocalState(PrefRegistrySimp
    DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
  #endif
  
@@ -622,7 +613,7 @@
    PlatformAuthPolicyObserver::RegisterPrefs(registry);
 --- a/chrome/browser/profiles/BUILD.gn
 +++ b/chrome/browser/profiles/BUILD.gn
-@@ -790,7 +790,6 @@ source_set("profiles_extra_parts_impl")
+@@ -802,7 +802,6 @@ source_set("profiles_extra_parts_impl")
    } else {
      deps += [
        "//chrome/browser/accessibility/phrase_segmentation",
@@ -630,7 +621,7 @@
        "//chrome/browser/accessibility_annotator/content_annotator",
        "//chrome/browser/apps/app_service",
        "//chrome/browser/autofill",
-@@ -808,7 +807,6 @@ source_set("profiles_extra_parts_impl")
+@@ -819,7 +818,6 @@ source_set("profiles_extra_parts_impl")
        "//chrome/browser/profile_resetter",
        "//chrome/browser/record_replay",
        "//chrome/browser/record_replay:impl",
@@ -640,7 +631,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
-@@ -127,7 +127,6 @@
+@@ -130,7 +130,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"
@@ -648,7 +639,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"
-@@ -379,7 +378,6 @@
+@@ -389,7 +388,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"
@@ -656,7 +647,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"
-@@ -1157,7 +1155,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1193,7 +1191,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
    net::ServerCertificateDatabaseServiceFactory::GetInstance();
  #endif
@@ -664,7 +655,7 @@
  #if BUILDFLAG(ENABLE_DICE_SUPPORT)
    HistorySyncOptinServiceFactory::GetInstance();
    ProfileManagementDisclaimerServiceFactory::GetInstance();
-@@ -1208,9 +1205,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1248,9 +1245,6 @@ void ChromeBrowserMainExtraPartsProfiles
    // TODO(b/502297163): Implement for Android.
    OneTimePermissionsTrackerFactory::GetInstance();
  #endif
@@ -674,7 +665,7 @@
    OptimizationGuideGlobalStateHolderKeyedServiceFactory::GetInstance();
    OptimizationGuideKeyedServiceFactory::GetInstance();
    OriginKeyedPermissionActionServiceFactory::GetInstance();
-@@ -1301,7 +1295,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1342,7 +1336,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
    policy::UserPolicyOidcSigninServiceFactory::GetInstance();
  #endif
@@ -682,7 +673,7 @@
    PredictionServiceFactory::GetInstance();
    predictors::AutocompleteActionPredictorFactory::GetInstance();
    predictors::LoadingPredictorFactory::GetInstance();
-@@ -1382,10 +1375,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1425,10 +1418,6 @@ void ChromeBrowserMainExtraPartsProfiles
    SafetyHubMenuNotificationServiceFactory::GetInstance();
  #if !BUILDFLAG(IS_ANDROID)
    SafetyHubHatsServiceFactory::GetInstance();
@@ -693,7 +684,7 @@
  #endif
  #if BUILDFLAG(IS_CHROMEOS)
    if (ash::features::IsScannerEnabled()) {
-@@ -1502,7 +1491,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1550,7 +1539,6 @@ void ChromeBrowserMainExtraPartsProfiles
    TopSitesFactory::GetInstance();
    translate::TranslateRankerFactory::GetInstance();
  #if !BUILDFLAG(IS_ANDROID)
@@ -717,7 +708,7 @@
    // System Profile.
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -902,11 +902,6 @@ void ProfileImpl::DoFinalInit(CreateMode
+@@ -920,11 +920,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);
@@ -751,7 +742,7 @@
  #if BUILDFLAG(IS_ANDROID)
 --- a/chrome/browser/resources/pdf/pdf_viewer.html
 +++ b/chrome/browser/resources/pdf/pdf_viewer.html
-@@ -103,10 +103,6 @@ import {AnnotationMode} from './constant
+@@ -102,10 +102,6 @@ import {AnnotationMode} from './constant
        </cr-page-selector>
      ` : ''}
    </if>
@@ -780,7 +771,7 @@
    }
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -1540,8 +1540,6 @@ static_library("ui") {
+@@ -1763,8 +1763,6 @@ static_library("ui") {
        "//chrome/browser/regional_capabilities",
        "//chrome/browser/safe_browsing",
        "//chrome/browser/safe_browsing:advanced_protection",
@@ -789,7 +780,7 @@
        "//chrome/browser/smart_card",
        "//chrome/browser/support_tool",
        "//chrome/browser/tab_group_sync:utils",
-@@ -2399,7 +2397,6 @@ static_library("ui") {
+@@ -2635,7 +2633,6 @@ static_library("ui") {
        "//chrome/browser/policy:onc",
        "//chrome/browser/policy:system_features_disable_list",
        "//chrome/browser/push_notification",
@@ -797,14 +788,14 @@
        "//chrome/browser/ui/ash/app_access",
        "//chrome/browser/ui/ash/arc",
        "//chrome/browser/ui/ash/arc/arc_app_dialog_view",
-@@ -4762,7 +4759,6 @@ static_library("ui") {
+@@ -4855,7 +4852,6 @@ static_library("ui") {
        "//chrome/browser/ui/waap:waap_utils",
        "//chrome/browser/ui/webauthn:impl",
        "//chrome/browser/ui/webui/app_service_internals",
 -      "//chrome/browser/ui/webui/autofill_ml_internals",
        "//chrome/browser/ui/webui/content_annotator_internals",
        "//chrome/browser/ui/webui/side_panel/customize_chrome",
-       "//chrome/browser/ui/window_name_prompt",
+       "//chrome/browser/ui/window_metadata",
 --- a/chrome/browser/ui/pdf/BUILD.gn
 +++ b/chrome/browser/ui/pdf/BUILD.gn
 @@ -6,7 +6,6 @@ import("//pdf/features.gni")
@@ -825,12 +816,12 @@
      "//chrome/common",
 --- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
 +++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
-@@ -146,22 +146,3 @@ void ChromePDFDocumentHelperClient::SetP
+@@ -199,22 +199,3 @@ void ChromePDFDocumentHelperClient::SetP
    }
  }
  
 -void ChromePDFDocumentHelperClient::OnSearchifyStarted(
--    content::RenderFrameHost* render_frame_host) {
+-    content::RenderFrameHost& render_frame_host) {
 -  // Show the promo only when ScreenAI component is available and OCR can be
 -  // done.
 -  if (!screen_ai::ScreenAIInstallState::GetInstance()->IsComponentAvailable()) {
@@ -850,17 +841,17 @@
 -}
 --- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h
 +++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h
-@@ -27,7 +27,6 @@ class ChromePDFDocumentHelperClient : pu
+@@ -32,7 +32,6 @@ class ChromePDFDocumentHelperClient : pu
    void OnSaveURL() override;
-   void SetPluginCanSave(content::RenderFrameHost* render_frame_host,
+   void SetPluginCanSave(content::RenderFrameHost& render_frame_host,
                          bool can_save) override;
--  void OnSearchifyStarted(content::RenderFrameHost* render_frame_host) override;
+-  void OnSearchifyStarted(content::RenderFrameHost& render_frame_host) override;
  
-   // Holds subscriptions for TabInterface callbacks.
-   std::vector<base::CallbackListSubscription> tab_subscriptions_;
+   void OnPdfTextExtracted(content::GlobalRenderFrameHostId render_frame_host_id,
+                           const std::u16string& text);
 --- a/chrome/browser/ui/tabs/public/tab_features.h
 +++ b/chrome/browser/ui/tabs/public/tab_features.h
-@@ -123,12 +123,6 @@ namespace permissions {
+@@ -125,12 +125,6 @@ namespace permissions {
  class PermissionIndicatorsTabData;
  }  // namespace permissions
  
@@ -873,7 +864,7 @@
  namespace sync_sessions {
  class SyncSessionsRouterTabHelper;
  }  // namespace sync_sessions
-@@ -565,10 +559,6 @@ class TabFeatures {
+@@ -581,10 +575,6 @@ class TabFeatures {
    std::unique_ptr<contextual_tasks::ContextualTasksTabVisitTracker>
        contextual_tasks_tab_visit_tracker_;
  
@@ -886,7 +877,7 @@
        saas_usage_navigation_observer_;
 --- a/chrome/browser/ui/tabs/tab_features.cc
 +++ b/chrome/browser/ui/tabs/tab_features.cc
-@@ -398,11 +398,6 @@ void TabFeatures::Init(TabInterface& tab
+@@ -423,11 +423,6 @@ void TabFeatures::Init(TabInterface& tab
            GetUserDataFactory().CreateInstance<actor::ui::ActorUiTabController>(
                tab, tab, actor::ActorKeyedService::Get(profile));
      }
@@ -898,7 +889,7 @@
  
      if (accessibility_annotator::
              ContentAnnotatorService* content_annotator_service =
-@@ -612,10 +607,6 @@ void TabFeatures::Init(TabInterface& tab
+@@ -657,10 +652,6 @@ void TabFeatures::Init(TabInterface& tab
  #endif
  
  #if !BUILDFLAG(IS_ANDROID)
@@ -911,9 +902,9 @@
          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
-@@ -908,40 +908,6 @@ void MaybeRegisterChromeFeaturePromos(
+@@ -993,40 +993,6 @@ void MaybeRegisterChromeFeaturePromos(
                         "Triggered when the PDF Viewer opens.")));
- #endif
+ #endif  // BUILDFLAG(ENABLE_PDF_INK2)
  
 -  // kIPHPdfSearchifyFeature:
 -  registry.RegisterFeature(std::move(
@@ -954,7 +945,7 @@
    registry.RegisterFeature(std::move(
 --- a/chrome/browser/ui/webui/BUILD.gn
 +++ b/chrome/browser/ui/webui/BUILD.gn
-@@ -116,7 +116,6 @@ source_set("configs") {
+@@ -120,7 +120,6 @@ source_set("configs") {
        "//chrome/browser/glic/selection",
        "//chrome/browser/ui/webui/access_code_cast",
        "//chrome/browser/ui/webui/app_service_internals",
@@ -964,7 +955,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
-@@ -337,7 +337,6 @@ void RegisterChromeWebUIConfigs() {
+@@ -340,7 +340,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>());
@@ -1071,6 +1062,16 @@
  };
  
  }  // namespace settings
+--- a/chrome/browser/ui/webui/side_panel/read_anything/BUILD.gn
++++ b/chrome/browser/ui/webui/side_panel/read_anything/BUILD.gn
+@@ -35,7 +35,6 @@ source_set("read_anything") {
+     "//chrome/browser/profiles:profile",
+     "//chrome/browser/resources/side_panel/read_anything:resources",
+     "//chrome/browser/resources/side_panel/shared:resources_grit",
+-    "//chrome/browser/screen_ai:screen_ai_service_router_factory",
+     "//chrome/browser/speech",
+     "//chrome/browser/translate",
+     "//chrome/browser/ui:accelerator_table",
 --- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
 +++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
 @@ -24,8 +24,6 @@
@@ -1082,7 +1083,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"
-@@ -431,14 +429,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
+@@ -409,14 +407,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
    prefs_lang = language::ExtractBaseLanguage(prefs_lang);
    SetDefaultLanguageCode(prefs_lang);
  
@@ -1099,7 +1100,7 @@
        !features::IsReadAnythingReadAloudPhraseHighlightingEnabled()) {
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -328,8 +328,6 @@ static_library("renderer") {
+@@ -331,8 +331,6 @@ static_library("renderer") {
      deps += [ "//chrome/common/wallet:mojo_bindings" ]
    } else {
      sources += [
@@ -1108,7 +1109,7 @@
        "accessibility/phrase_segmentation/base_phrase_segmenter.cc",
        "accessibility/phrase_segmentation/base_phrase_segmenter.h",
        "accessibility/phrase_segmentation/dependency_parser_model.cc",
-@@ -346,16 +344,6 @@ static_library("renderer") {
+@@ -349,16 +347,6 @@ static_library("renderer") {
        "accessibility/phrase_segmentation/tokenized_sentence.h",
        "accessibility/phrase_segmentation/tokenizer.cc",
        "accessibility/phrase_segmentation/tokenizer.h",
@@ -1125,7 +1126,7 @@
        "media/chrome_speech_recognition_client.cc",
        "media/chrome_speech_recognition_client.h",
        "searchbox/searchbox.cc",
-@@ -371,7 +359,6 @@ static_library("renderer") {
+@@ -374,7 +362,6 @@ static_library("renderer") {
        "//components/record_replay/content/renderer",
        "//components/trusted_vault",
        "//services/screen_ai/buildflags",
@@ -1160,7 +1161,7 @@
    guest_view::SlimWebViewBindings::MaybeInstall(*render_frame());
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -2927,9 +2927,6 @@ if (!is_android) {
+@@ -2479,9 +2479,6 @@ if (!is_android) {
        "//chrome/browser/resource_coordinator:mojo_bindings",
        "//chrome/browser/safe_browsing:advanced_protection",
        "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
@@ -1168,9 +1169,9 @@
 -      "//chrome/browser/screen_ai:screen_ai_install_state",
 -      "//chrome/browser/screen_ai:screen_ai_service_router_factory",
        "//chrome/browser/search",
-       "//chrome/browser/search_engines",
-       "//chrome/browser/segmentation_platform:test_utils",
-@@ -3444,8 +3441,6 @@ if (!is_android) {
+       "//chrome/browser/search:browser_tests",
+       "//chrome/browser/search:test_support",
+@@ -3027,8 +3024,6 @@ if (!is_android) {
        "//services/preferences/public/cpp",
        "//services/preferences/public/cpp/tracked",
        "//services/preferences/tracked:features",
@@ -1179,7 +1180,7 @@
        "//services/service_manager/public/cpp",
        "//services/strings",
        "//services/test/echo/public/mojom",
-@@ -8926,7 +8921,6 @@ test("unit_tests") {
+@@ -7501,7 +7496,6 @@ test("unit_tests") {
      # TODO(crbug.com/417513088): Maybe merge with the non-android `deps`
      # declaration above?
      deps += [
@@ -1187,17 +1188,17 @@
        "//chrome:packed_resources",
        "//chrome/browser/apps:icon_standardizer",
        "//chrome/browser/apps/app_service",
-@@ -8965,7 +8959,6 @@ test("unit_tests") {
+@@ -7540,7 +7534,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",
 -      "//chrome/browser/screen_ai:unit_tests",
        "//chrome/browser/search/background",
        "//chrome/browser/search_engine_choice:unit_tests",
-       "//chrome/browser/support_tool",
+       "//chrome/browser/sensor:unit_tests",
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
-@@ -147,7 +147,6 @@ static_library("utility") {
+@@ -148,7 +148,6 @@ static_library("utility") {
        "//components/user_data_importer/content",
        "//components/user_data_importer/utility:bookmarks",
        "//services/proxy_resolver:lib",
@@ -1207,8 +1208,8 @@
  
 --- a/chrome/utility/services.cc
 +++ b/chrome/utility/services.cc
-@@ -62,8 +62,6 @@
- #include "components/private_ai/oak_session_service/oak_session_service.h"  // nogncheck
+@@ -63,8 +63,6 @@
+ #include "components/mirroring/service/mirroring_service.h"
  #include "services/proxy_resolver/proxy_resolver_factory_impl.h"  // nogncheck
  #include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
 -#include "services/screen_ai/public/mojom/screen_ai_factory.mojom.h"  // nogncheck
@@ -1216,30 +1217,28 @@
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
-@@ -266,12 +264,6 @@ auto RunSpeechRecognitionService(
+@@ -276,10 +274,6 @@ auto RunReadingModeMetricsService(
+       std::move(receiver));
  }
- #endif  // !BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
  
--#if !BUILDFLAG(IS_ANDROID)
 -auto RunScreenAIServiceFactory(
 -    mojo::PendingReceiver<screen_ai::mojom::ScreenAIServiceFactory> receiver) {
 -  return std::make_unique<screen_ai::ScreenAIService>(std::move(receiver));
 -}
--#endif
+ #endif
  
  #if (BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION) && \
-      !BUILDFLAG(IS_ANDROID)) ||                      \
-@@ -451,7 +443,6 @@ void RegisterMainThreadServices(mojo::Se
-   services.Add(RunOakSessionService);
+@@ -461,7 +455,6 @@ void RegisterMainThreadServices(mojo::Se
    services.Add(RunProfileImporter);
    services.Add(RunMirroringService);
+   services.Add(RunReadingModeMetricsService);
 -  services.Add(RunScreenAIServiceFactory);
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
 --- a/components/BUILD.gn
 +++ b/components/BUILD.gn
-@@ -645,7 +645,6 @@ test("components_unittests") {
+@@ -649,7 +649,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",
@@ -1258,7 +1257,7 @@
    GeoIpCountryCode country_code;
    LanguageCode current_page_language;
    std::unique_ptr<BufferingLogManager> log_manager;
-@@ -849,10 +847,8 @@ void AutofillManager::RunMlModels(
+@@ -858,10 +856,8 @@ void AutofillManager::RunMlModels(
                                     }));
          switch (source) {
            case HeuristicSource::kAutofillMachineLearning:
@@ -1269,7 +1268,7 @@
              break;
            case HeuristicSource::kRegexes:
              NOTREACHED();
-@@ -1061,12 +1057,6 @@ void AutofillManager::UpdateFormCache(
+@@ -1070,12 +1066,6 @@ void AutofillManager::UpdateFormCache(
  
    auto apply_predictions = [](FormStructure& form_structure,
                                const AsyncContext& context, size_t i) {
@@ -1282,7 +1281,7 @@
      if (!context.regex_predictions.empty()) {
        context.regex_predictions[i].ApplyTo(form_structure.fields());
      }
-@@ -1160,26 +1150,6 @@ void AutofillManager::LogCurrentFieldTyp
+@@ -1169,26 +1159,6 @@ void AutofillManager::LogCurrentFieldTyp
  
  void AutofillManager::SubscribeToMlModelChanges(
      FieldClassificationModelHandler& handler) {
@@ -1311,7 +1310,7 @@
  }  // namespace autofill
 --- a/components/page_content_annotations/content/BUILD.gn
 +++ b/components/page_content_annotations/content/BUILD.gn
-@@ -72,8 +72,6 @@ source_set("page_embeddings") {
+@@ -74,8 +74,6 @@ source_set("page_embeddings") {
    sources = [
      "embeddings_candidate_generator.cc",
      "embeddings_candidate_generator.h",

diff --git a/fix-partition-alloc-compile.patch b/fix-partition-alloc-compile.patch
deleted file mode 100644
index 2fd5cfb..0000000
--- a/fix-partition-alloc-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-kIndex: chromium-114.0.5735.45/base/allocator/partition_allocator/partition_alloc.gni
-===================================================================
-Index: chromium-144.0.7559.59/base/allocator/partition_allocator/partition_alloc.gni
-===================================================================
---- chromium-144.0.7559.59.orig/base/allocator/partition_allocator/partition_alloc.gni
-+++ chromium-144.0.7559.59/base/allocator/partition_allocator/partition_alloc.gni
-@@ -71,7 +71,7 @@ is_clang_or_gcc = is_clang || !is_win
- # Whether 64-bit pointers are used.
- # A static_assert in partition_alloc_config.h verifies that.
- if (current_cpu == "x64" || current_cpu == "arm64" || current_cpu == "arm64e" ||
--    current_cpu == "loong64" || current_cpu == "riscv64") {
-+    current_cpu == "loong64" || current_cpu == "riscv64" || current_cpu == "ppc64") {
-   assert(current_cpu != "arm64e" || (is_ios && target_environment == "device"))
-   has_64_bit_pointers = true
- } else if (current_cpu == "x86" || current_cpu == "arm" ||

diff --git a/skia-vsx-instructions.patch b/skia-vsx-instructions.patch
index 334a6f0..320abd1 100644
--- a/skia-vsx-instructions.patch
+++ b/skia-vsx-instructions.patch
@@ -1,8 +1,8 @@
-Index: chromium-148.0.7778.96/third_party/skia/BUILD.gn
+Index: chromium-151.0.7922.47/third_party/skia/BUILD.gn
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/BUILD.gn
-+++ chromium-148.0.7778.96/third_party/skia/BUILD.gn
-@@ -196,6 +196,12 @@ opts("lasx") {
+--- chromium-151.0.7922.47.orig/third_party/skia/BUILD.gn
++++ chromium-151.0.7922.47/third_party/skia/BUILD.gn
+@@ -201,6 +201,12 @@ opts("lasx") {
    cflags = [ "-mlasx" ]
  }
  
@@ -15,7 +15,7 @@ Index: chromium-148.0.7778.96/third_party/skia/BUILD.gn
  # Any feature of Skia that requires third-party code should be optional and use this template.
  template("optional") {
    if (invoker.enabled) {
-@@ -1925,6 +1931,7 @@ skia_component("skia") {
+@@ -1945,6 +1951,7 @@ skia_component("skia") {
      ":typeface_fontations",
      ":typeface_freetype",
      ":vello",
@@ -23,11 +23,11 @@ Index: chromium-148.0.7778.96/third_party/skia/BUILD.gn
      ":webp_decode",
      ":wuffs",
      ":xml",
-Index: chromium-148.0.7778.96/third_party/skia/gn/skia/BUILD.gn
+Index: chromium-151.0.7922.47/third_party/skia/gn/skia/BUILD.gn
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/gn/skia/BUILD.gn
-+++ chromium-148.0.7778.96/third_party/skia/gn/skia/BUILD.gn
-@@ -142,6 +142,8 @@ config("default") {
+--- chromium-151.0.7922.47.orig/third_party/skia/gn/skia/BUILD.gn
++++ chromium-151.0.7922.47/third_party/skia/gn/skia/BUILD.gn
+@@ -146,6 +146,8 @@ config("default") {
        "-mfpmath=sse",
      ]
      ldflags += [ "-m32" ]
@@ -36,10 +36,10 @@ Index: chromium-148.0.7778.96/third_party/skia/gn/skia/BUILD.gn
    } else if (current_cpu == "loong64") {
      cflags += [
        "-mlsx",
-Index: chromium-148.0.7778.96/third_party/skia/include/core/SkTypes.h
+Index: chromium-151.0.7922.47/third_party/skia/include/core/SkTypes.h
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/include/core/SkTypes.h
-+++ chromium-148.0.7778.96/third_party/skia/include/core/SkTypes.h
+--- chromium-151.0.7922.47.orig/third_party/skia/include/core/SkTypes.h
++++ chromium-151.0.7922.47/third_party/skia/include/core/SkTypes.h
 @@ -190,4 +190,43 @@ static constexpr uint32_t SK_InvalidGenI
  */
  static constexpr uint32_t SK_InvalidUniqueID = 0;
@@ -84,10 +84,10 @@ Index: chromium-148.0.7778.96/third_party/skia/include/core/SkTypes.h
 +#endif
 +
  #endif
-Index: chromium-148.0.7778.96/third_party/skia/src/base/SkSpinlock.cpp
+Index: chromium-151.0.7922.47/third_party/skia/src/core/SkSpinlock.cpp
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/src/base/SkSpinlock.cpp
-+++ chromium-148.0.7778.96/third_party/skia/src/base/SkSpinlock.cpp
+--- chromium-151.0.7922.47.orig/third_party/skia/src/core/SkSpinlock.cpp
++++ chromium-151.0.7922.47/third_party/skia/src/core/SkSpinlock.cpp
 @@ -33,7 +33,8 @@
  #endif
  
@@ -98,10 +98,10 @@ Index: chromium-148.0.7778.96/third_party/skia/src/base/SkSpinlock.cpp
      #include <emmintrin.h>
      static void do_pause() { _mm_pause(); }
  #else
-Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkBitmapProcState_opts.h
+Index: chromium-151.0.7922.47/third_party/skia/src/opts/SkBitmapProcState_opts.h
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
-+++ chromium-148.0.7778.96/third_party/skia/src/opts/SkBitmapProcState_opts.h
+--- chromium-151.0.7922.47.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
++++ chromium-151.0.7922.47/third_party/skia/src/opts/SkBitmapProcState_opts.h
 @@ -21,7 +21,13 @@
  // The rest are scattershot at the moment but I want to get them
  // all migrated to be normal code inside SkBitmapProcState.cpp.
@@ -117,10 +117,10 @@ Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkBitmapProcState_opts.h
      #include <immintrin.h>
  #elif defined(SK_ARM_HAS_NEON)
      #include <arm_neon.h>
-Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkBlitRow_opts.h
+Index: chromium-151.0.7922.47/third_party/skia/src/opts/SkBlitRow_opts.h
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/src/opts/SkBlitRow_opts.h
-+++ chromium-148.0.7778.96/third_party/skia/src/opts/SkBlitRow_opts.h
+--- chromium-151.0.7922.47.orig/third_party/skia/src/opts/SkBlitRow_opts.h
++++ chromium-151.0.7922.47/third_party/skia/src/opts/SkBlitRow_opts.h
 @@ -69,7 +69,7 @@
  #endif
  
@@ -130,10 +130,10 @@ Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkBlitRow_opts.h
  
      static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) {
          __m128i scale = _mm_sub_epi32(_mm_set1_epi32(256),
-Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkRasterPipeline_opts.h
+Index: chromium-151.0.7922.47/third_party/skia/src/opts/SkRasterPipeline_opts.h
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
-+++ chromium-148.0.7778.96/third_party/skia/src/opts/SkRasterPipeline_opts.h
+--- chromium-151.0.7922.47.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
++++ chromium-151.0.7922.47/third_party/skia/src/opts/SkRasterPipeline_opts.h
 @@ -1,5 +1,6 @@
  /*
   * Copyright 2018 Google LLC
@@ -394,7 +394,7 @@ Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkRasterPipeline_opts.h
      // These platforms are ideal for wider stages, and their default ABI is ideal.
      #define ABI
      #define SKRP_NARROW_STAGES 0
-@@ -5628,6 +5838,10 @@ SI F sqrt_(F x) {
+@@ -5648,6 +5858,10 @@ SI F sqrt_(F x) {
      float32x4_t lo,hi;
      split(x, &lo,&hi);
      return join<F>(sqrt(lo), sqrt(hi));
@@ -405,7 +405,7 @@ Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkRasterPipeline_opts.h
  #elif defined(SKRP_CPU_LASX)
      __m256 lo,hi;
      split(x, &lo,&hi);
-@@ -5659,6 +5873,10 @@ SI F floor_(F x) {
+@@ -5679,6 +5893,10 @@ SI F floor_(F x) {
      __m128 lo,hi;
      split(x, &lo,&hi);
      return join<F>(_mm_floor_ps(lo), _mm_floor_ps(hi));
@@ -416,7 +416,7 @@ Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkRasterPipeline_opts.h
  #elif defined(SKRP_CPU_LASX)
      __m256 lo,hi;
      split(x, &lo,&hi);
-@@ -5678,6 +5896,7 @@ SI F floor_(F x) {
+@@ -5698,6 +5916,7 @@ SI F floor_(F x) {
  //     (2 * a * b + (1 << 15)) >> 16
  // The result is a number on [-1, 1).
  // Note: on neon this is a saturating multiply while the others are not.
@@ -424,7 +424,7 @@ Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkRasterPipeline_opts.h
  SI I16 scaled_mult(I16 a, I16 b) {
  #if defined(SKRP_CPU_ML4)
      return (I16)_mm256_mulhrs_epi16((__m256i)a, (__m256i)b);
-@@ -5689,6 +5908,22 @@ SI I16 scaled_mult(I16 a, I16 b) {
+@@ -5709,6 +5928,22 @@ SI I16 scaled_mult(I16 a, I16 b) {
      return vqrdmulhq_s16(a, b);
  #elif defined(SKRP_CPU_NEON)
      return vqrdmulhq_s16(a, b);
@@ -447,7 +447,7 @@ Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkRasterPipeline_opts.h
  #elif defined(SKRP_CPU_LASX)
      I16 res = __lasx_xvmuh_h(a, b);
      return __lasx_xvslli_h(res, 1);
-@@ -5716,7 +5951,26 @@ SI U16 constrained_add(I16 a, U16 b) {
+@@ -5736,7 +5971,26 @@ SI U16 constrained_add(I16 a, U16 b) {
              SkASSERT(-ib <= ia && ia <= 65535 - ib);
          }
      #endif
@@ -474,7 +474,7 @@ Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkRasterPipeline_opts.h
  }
  
  SI F fract(F x) { return x - floor_(x); }
-@@ -6772,8 +7026,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
+@@ -6797,8 +7051,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
      //         2^-8 * v = 2^-9 * (tx*(R - L) + (R + L))
      //                v = 1/2 * (tx*(R - L) + (R + L))
      auto lerpX = [&](U16 left, U16 right) -> U16 {
@@ -489,7 +489,7 @@ Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkRasterPipeline_opts.h
          // The constrained_add is the most subtle part of lerp. The first term is on the interval
          // [-1, 1), and the second term is on the interval is on the interval [0, 1) because
          // both terms are too high by a factor of 2 which will be handled below. (Both R and L are
-@@ -6785,7 +7045,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
+@@ -6810,7 +7070,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
          U16 v2  = constrained_add(scaled_mult(tx, width), middle) + 1;
          // Divide by 2 to calculate v and at the same time bring the intermediate value onto the
          // interval [0, 1/2] to set up for the lerpY.
@@ -502,7 +502,7 @@ Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkRasterPipeline_opts.h
      };
  
      const uint32_t* ptr;
-@@ -6819,9 +7084,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
+@@ -6844,9 +7109,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
          I16 width  = (I16)bottom - (I16)top;
          U16 middle = bottom + top;
          // Add + 0x80 for rounding.
@@ -519,10 +519,10 @@ Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkRasterPipeline_opts.h
      };
  
      r = lerpY(topR, bottomR);
-Index: chromium-148.0.7778.96/third_party/skia/src/base/SkVx.h
+Index: chromium-151.0.7922.47/third_party/skia/src/core/SkVx.h
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/src/base/SkVx.h
-+++ chromium-148.0.7778.96/third_party/skia/src/base/SkVx.h
+--- chromium-151.0.7922.47.orig/third_party/skia/src/core/SkVx.h
++++ chromium-151.0.7922.47/third_party/skia/src/core/SkVx.h
 @@ -39,7 +39,12 @@
  #endif
  
@@ -537,10 +537,10 @@ Index: chromium-148.0.7778.96/third_party/skia/src/base/SkVx.h
          #include <immintrin.h>
      #elif SK_CPU_X64_LEVEL >= SK_CPU_X64_LEVEL_SSE41
          #include <smmintrin.h>
-Index: chromium-148.0.7778.96/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
+Index: chromium-151.0.7922.47/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
-+++ chromium-148.0.7778.96/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
+--- chromium-151.0.7922.47.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
++++ chromium-151.0.7922.47/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
 @@ -9,7 +9,7 @@
  #include "src/core/SkBlitMask.h"
  #include "src/core/SkOptsTargets.h"
@@ -550,10 +550,10 @@ Index: chromium-148.0.7778.96/third_party/skia/src/core/SkBlitMask_opts_ssse3.cp
  
  // The order of these includes is important:
  // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
-Index: chromium-148.0.7778.96/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
+Index: chromium-151.0.7922.47/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
-+++ chromium-148.0.7778.96/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
+--- chromium-151.0.7922.47.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
++++ chromium-151.0.7922.47/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
 @@ -10,7 +10,7 @@
  #include "src/core/SkOptsTargets.h"
  #include "src/core/SkSwizzlePriv.h"
@@ -563,10 +563,10 @@ Index: chromium-148.0.7778.96/third_party/skia/src/core/SkSwizzler_opts_ssse3.cp
      !defined(SK_ENABLE_OPTIMIZE_SIZE) && \
      SK_CPU_X64_LEVEL < SK_CPU_X64_LEVEL_SSSE3
  
-Index: chromium-148.0.7778.96/third_party/skia/src/core/SkBlitMask_opts.cpp
+Index: chromium-151.0.7922.47/third_party/skia/src/core/SkBlitMask_opts.cpp
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/src/core/SkBlitMask_opts.cpp
-+++ chromium-148.0.7778.96/third_party/skia/src/core/SkBlitMask_opts.cpp
+--- chromium-151.0.7922.47.orig/third_party/skia/src/core/SkBlitMask_opts.cpp
++++ chromium-151.0.7922.47/third_party/skia/src/core/SkBlitMask_opts.cpp
 @@ -25,7 +25,7 @@ namespace SkOpts {
      static bool init() {
      #if defined(SK_ENABLE_OPTIMIZE_SIZE)
@@ -576,10 +576,10 @@ Index: chromium-148.0.7778.96/third_party/skia/src/core/SkBlitMask_opts.cpp
          #if SK_CPU_X64_LEVEL < SK_CPU_X64_LEVEL_SSSE3
              if (SkCpu::Supports(SkX64::SSSE3)) { Init_BlitMask_ssse3(); }
          #endif
-Index: chromium-148.0.7778.96/third_party/skia/src/core/SkBitmapProcState_opts.cpp
+Index: chromium-151.0.7922.47/third_party/skia/src/core/SkBitmapProcState_opts.cpp
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
-+++ chromium-148.0.7778.96/third_party/skia/src/core/SkBitmapProcState_opts.cpp
+--- chromium-151.0.7922.47.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
++++ chromium-151.0.7922.47/third_party/skia/src/core/SkBitmapProcState_opts.cpp
 @@ -27,7 +27,7 @@ namespace SkOpts {
      static bool init() {
      #if defined(SK_ENABLE_OPTIMIZE_SIZE)
@@ -589,10 +589,10 @@ Index: chromium-148.0.7778.96/third_party/skia/src/core/SkBitmapProcState_opts.c
          #if SK_CPU_X64_LEVEL < SK_CPU_X64_LEVEL_SSSE3
              if (SkCpu::Supports(SkX64::SSSE3)) { Init_BitmapProcState_ssse3(); }
          #endif
-Index: chromium-148.0.7778.96/third_party/skia/src/core/SkCpu.h
+Index: chromium-151.0.7922.47/third_party/skia/src/core/SkCpu.h
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/src/core/SkCpu.h
-+++ chromium-148.0.7778.96/third_party/skia/src/core/SkCpu.h
+--- chromium-151.0.7922.47.orig/third_party/skia/src/core/SkCpu.h
++++ chromium-151.0.7922.47/third_party/skia/src/core/SkCpu.h
 @@ -60,7 +60,7 @@ inline bool SkCpu::Supports(uint32_t mas
  
      // If we mask in compile-time known lower limits, the compiler can
@@ -602,12 +602,12 @@ Index: chromium-148.0.7778.96/third_party/skia/src/core/SkCpu.h
      #if SK_CPU_X64_LEVEL >= SK_CPU_X64_LEVEL_SSE1
      features |= SkX64::SSE1;
      #endif
-Index: chromium-148.0.7778.96/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
+Index: chromium-151.0.7922.47/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
-+++ chromium-148.0.7778.96/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
+--- chromium-151.0.7922.47.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
++++ chromium-151.0.7922.47/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
 @@ -8,7 +8,7 @@
- #include "include/private/base/SkFeatures.h"
+ #include "include/private/SkFeatures.h"
  #include "src/core/SkOptsTargets.h"
  
 -#if defined(SK_CPU_X86) && !defined(SK_ENABLE_OPTIMIZE_SIZE)
@@ -615,10 +615,10 @@ Index: chromium-148.0.7778.96/third_party/skia/src/core/SkBitmapProcState_opts_s
  
  // The order of these includes is important:
  // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
-Index: chromium-148.0.7778.96/third_party/skia/include/private/base/SkFeatures.h
+Index: chromium-151.0.7922.47/third_party/skia/include/private/SkFeatures.h
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/include/private/base/SkFeatures.h
-+++ chromium-148.0.7778.96/third_party/skia/include/private/base/SkFeatures.h
+--- chromium-151.0.7922.47.orig/third_party/skia/include/private/SkFeatures.h
++++ chromium-151.0.7922.47/third_party/skia/include/private/SkFeatures.h
 @@ -67,6 +67,8 @@
  
  #if defined(__i386) || defined(_M_IX86) ||  defined(__x86_64__) || defined(_M_X64)
@@ -628,10 +628,10 @@ Index: chromium-148.0.7778.96/third_party/skia/include/private/base/SkFeatures.h
  #endif
  
  #if defined(__loongarch__) || defined (__loongarch64)
-Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkSwizzler_opts.inc
+Index: chromium-151.0.7922.47/third_party/skia/src/opts/SkSwizzler_opts.inc
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/src/opts/SkSwizzler_opts.inc
-+++ chromium-148.0.7778.96/third_party/skia/src/opts/SkSwizzler_opts.inc
+--- chromium-151.0.7922.47.orig/third_party/skia/src/opts/SkSwizzler_opts.inc
++++ chromium-151.0.7922.47/third_party/skia/src/opts/SkSwizzler_opts.inc
 @@ -14,7 +14,10 @@
  #include <cmath>
  #include <utility>
@@ -678,10 +678,10 @@ Index: chromium-148.0.7778.96/third_party/skia/src/opts/SkSwizzler_opts.inc
  #elif SK_CPU_X64_LEVEL >= SK_CPU_X64_LEVEL_SSE1 && (defined(__clang__) || !defined(_MSC_VER))
  // -- SSE -- Harden against timing attacks -- MSVC is not supported.
  using F4 = __m128;
-Index: chromium-148.0.7778.96/third_party/skia/src/core/SkBlitter_ARGB32.cpp
+Index: chromium-151.0.7922.47/third_party/skia/src/core/SkBlitter_ARGB32.cpp
 ===================================================================
---- chromium-148.0.7778.96.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
-+++ chromium-148.0.7778.96/third_party/skia/src/core/SkBlitter_ARGB32.cpp
+--- chromium-151.0.7922.47.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
++++ chromium-151.0.7922.47/third_party/skia/src/core/SkBlitter_ARGB32.cpp
 @@ -129,6 +129,16 @@ static inline SkPMColor blend_lcd16_opaq
  #if SK_CPU_X64_LEVEL >= SK_CPU_X64_LEVEL_SSE2
      #include <emmintrin.h>

diff --git a/sources b/sources
index 6dd4671..4579b79 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (node-v22.22.0-stripped.tar.gz) = f32a8a73063b3c78cbacf941e11dd529ebcf2618b3ba661966312e49ee9870c43a3acf256e8d331a4b0b621b16a501810c02a3ad763c75884cc250addca8e106
-SHA512 (chromium-150.0.7871.186-clean.tar.xz) = c217d1ae0a5601c42f92997af527426b5f7ef827519909725166c5ab3c02366c5deffd56324017b4b7961b269877b64af515b26edab86d7a225a7e6e1aca5e0f
+SHA512 (chromium-151.0.7922.71-clean.tar.xz) = 81ea7343f4fee4fc1a66a7fab47d2d691bbdbbb2db7b903f630fbbcd9cdebc2a0706d8f4831ea7d2dc25c5201a18946f36b0ce11f2e123b30c88f70f26ba929f

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

only message in thread, other threads:[~2026-07-30 13:15 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-30 13:15 [rpms/chromium] f43: - security release 151.0.7922.71 includes 370 security fixes Than Ngo

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