[rpms/chromium] epel10.2: - Update to 150.0.7871.46

[rpms/chromium] epel10.2: - Update to 150.0.7871.46

[Than Ngo]

            A new commit has been pushed.

            Repo   : rpms/chromium
            Branch : epel10.2
            Commit : 5303358b07ca1e0c9ed93eb29e4a6b4bda6a2efd
            Author : Than Ngo <than@redhat.com>
            Date   : 2026-07-02T16:45:57+02:00
            Stats  : +31226/-28425 in 20 file(s)
            URL    : https://src.fedoraproject.org/rpms/chromium/c/5303358b07ca1e0c9ed93eb29e4a6b4bda6a2efd?branch=epel10.2

            Log:
            - Update to 150.0.7871.46
  * CVE-2026-13774: Use after free in Extensions
  * CVE-2026-13775: Use after free in GPU
  * CVE-2026-13776: Type Confusion in Dawn
  * CVE-2026-13777: Insufficient validation of untrusted input in iOSWeb
  * CVE-2026-13778: Use after free in WebUSB
  * CVE-2026-13779: Use after free in Chromoting
  * CVE-2026-13780: Insufficient validation of untrusted input in ANGLE
  * CVE-2026-13781: Insufficient validation of untrusted input in Skia
  * CVE-2026-13782: Use after free in Browser
  * CVE-2026-13783: Use after free in Views
  * CVE-2026-13784: Use after free in Views
  * CVE-2026-13785: Use after free in Bluetooth
  * CVE-2026-13786: Use after free in Ozone
  * CVE-2026-13787: Use after free in Chromoting
  * CVE-2026-13788: Use after free in Fullscreen
  * CVE-2026-13789: Use after free in GPU
  * CVE-2026-13790: Side-channel information leakage in Scroll
  * CVE-2026-13791: Insufficient validation of untrusted input in Downloads
  * CVE-2026-13792: Use after free in Touchbar
  * CVE-2026-13793: Insufficient policy enforcement in SVG
  * CVE-2026-13794: Insufficient validation of untrusted input in WebAppInstalls
  * CVE-2026-13795: Insufficient policy enforcement in Chrome for iOS
  * CVE-2026-13796: Integer overflow in Chromecast
  * CVE-2026-13797: Insufficient validation of untrusted input in Chromecast
  * CVE-2026-13798: Heap buffer overflow in Chromecast
  * CVE-2026-13799: Use after free in QUIC
  * CVE-2026-13800: Inappropriate implementation in Updater
  * CVE-2026-13801: Integer overflow in Chromecast
  * CVE-2026-13802: Use after free in Views
  * CVE-2026-13803: Type Confusion in Chrome Tabs
  * CVE-2026-13804: Use after free in Chromecast
  * CVE-2026-13805: Use after free in GFX
  * CVE-2026-13806: Insufficient validation of untrusted input in Accessibility
  * CVE-2026-13807: Use after free in Import
  * CVE-2026-13808: Insufficient data validation in Chrome for iOS
  * CVE-2026-13809: Side-channel information leakage in Safe Browsing
  * CVE-2026-13810: Inappropriate implementation in Input
  * CVE-2026-13811: Use after free in IME
  * CVE-2026-13812: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-13813: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-13814: Use after free in Views
  * CVE-2026-13815: Use after free in Blink
  * CVE-2026-13816: Insufficient validation of untrusted input in File Input
  * CVE-2026-13817: Insufficient validation of untrusted input in Glic
  * CVE-2026-13818: Inappropriate implementation in Passwords
  * CVE-2026-13819: Out of bounds read in ANGLE
  * CVE-2026-13820: Out of bounds read in Skia
  * CVE-2026-13821: Use after free in Canvas
  * CVE-2026-13822: Inappropriate implementation in Extensions
  * CVE-2026-13823: Use after free in Glic
  * CVE-2026-13824: Insufficient validation of untrusted input in Extensions
  * CVE-2026-13825: Uninitialized Use in Dawn
  * CVE-2026-13826: Inappropriate implementation in Autofill
  * CVE-2026-13827: Use after free in Updater
  * CVE-2026-13828: Inappropriate implementation in Enterprise
  * CVE-2026-13829: Insufficient validation of untrusted input in Settings
  * CVE-2026-13830: Use after free in Chromoting
  * CVE-2026-13831: Use after free in GPU
  * CVE-2026-13832: Use after free in Headless
  * CVE-2026-13833: Uninitialized Use in ANGLE
  * CVE-2026-13834: Insufficient validation of untrusted input in ANGLE
  * CVE-2026-13835: Inappropriate implementation in XML
  * CVE-2026-13836: Inappropriate implementation in CSS
  * CVE-2026-13837: Inappropriate implementation in CSS
  * CVE-2026-13838: Inappropriate implementation in CSS
  * CVE-2026-13839: Inappropriate implementation in CSS
  * CVE-2026-13840: Insufficient policy enforcement in Canvas
  * CVE-2026-13841: Integer overflow in Skia
  * CVE-2026-13842: Incorrect security UI in Chrome for iOS
  * CVE-2026-13843: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-13844: Use after free in Updater
  * CVE-2026-13845: Use after free in DOM
  * CVE-2026-13846: Use after free in USB
  * CVE-2026-13847: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-13848: Use after free in Forms
  * CVE-2026-13849: Insufficient validation of untrusted input in Chromoting
  * CVE-2026-13850: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-13851: Insufficient validation of untrusted input in WebAppInstalls
  * CVE-2026-13852: Insufficient validation of untrusted input in WebAppInstalls
  * CVE-2026-13853: Use after free in Journeys
  * CVE-2026-13854: Use after free in Ozone
  * CVE-2026-13855: Use after free in Ozone
  * CVE-2026-13856: Insufficient validation of untrusted input in Speech
  * CVE-2026-13857: Inappropriate implementation in Geometry
  * CVE-2026-13858: Out of bounds read in FFmpeg
  * CVE-2026-13859: Inappropriate implementation in ANGLE
  * CVE-2026-13860: Incorrect security UI in Autofill
  * CVE-2026-13861: Use after free in Core
  * CVE-2026-13862: Insufficient policy enforcement in Web Authentication (Passkeys & Security Keys)
  * CVE-2026-13863: Insufficient validation of untrusted input in CustomTabs
  * CVE-2026-13864: Insufficient policy enforcement in WebHID
  * CVE-2026-13865: Insufficient validation of untrusted input in Enterprise
  * CVE-2026-13866: Insufficient validation of untrusted input in Input
  * CVE-2026-13867: Inappropriate implementation in Geolocation
  * CVE-2026-13868: Inappropriate implementation in Network
  * CVE-2026-13869: Use after free in Device
  * CVE-2026-13870: Use after free in WebView
  * CVE-2026-13871: Insufficient data validation in GuestView
  * CVE-2026-13872: Insufficient validation of untrusted input in WebAppInstalls
  * CVE-2026-13873: Out of bounds memory access in Layout
  * CVE-2026-13874: Inappropriate implementation in DataTransfer
  * CVE-2026-13875: Insufficient validation of untrusted input in GPU
  * CVE-2026-13876: Inappropriate implementation in Network
  * CVE-2026-13877: Insufficient validation of untrusted input in ANGLE
  * CVE-2026-13878: Use after free in Bluetooth
  * CVE-2026-13879: Use after free in Bluetooth
  * CVE-2026-13880: Use after free in USB
  * CVE-2026-13881: Insufficient data validation in WebAppInstalls
  * CVE-2026-13882: Inappropriate implementation in USB
  * CVE-2026-13883: Type Confusion in ANGLE
  * CVE-2026-13884: Heap buffer overflow in Chromecast
  * CVE-2026-13885: Use after free in Skia
  * CVE-2026-13886: Policy bypass in Isolated Web Apps
  * CVE-2026-13887: Insufficient policy enforcement in NFC
  * CVE-2026-13888: Use after free in Extensions
  * CVE-2026-13889: Insufficient validation of untrusted input in WebAuthentication
  * CVE-2026-13890: Out of bounds read in Chromecast
  * CVE-2026-13891: Insufficient validation of untrusted input in Extensions
  * CVE-2026-13892: Inappropriate implementation in Chrome for iOS
  * CVE-2026-13893: Insufficient validation of untrusted input in WebUI
  * CVE-2026-13894: Insufficient policy enforcement in Network
  * CVE-2026-13895: Inappropriate implementation in Autofill
  * CVE-2026-13896: Insufficient policy enforcement in Glic
  * CVE-2026-13897: Insufficient policy enforcement in Chromecast
  * CVE-2026-13898: Use after free in Cast Receiver
  * CVE-2026-13899: Use after free in HTML
  * CVE-2026-13900: Insufficient validation of untrusted input in Chromecast
  * CVE-2026-13901: Insufficient validation of untrusted input in Serial
  * CVE-2026-13902: Inappropriate implementation in Chrome for iOS
  * CVE-2026-13903: Insufficient policy enforcement in Bluetooth
  * CVE-2026-13904: Incorrect security UI in Safe Browsing
  * CVE-2026-13905: Incorrect security UI in Chrome for iOS
  * CVE-2026-13906: Out of bounds read in Codecs
  * CVE-2026-13907: Inappropriate implementation in iOSWeb
  * CVE-2026-13908: Insufficient validation of untrusted input in Omnibox
  * CVE-2026-13909: Insufficient policy enforcement in DevTools
  * CVE-2026-13910: Insufficient policy enforcement in WebXR
  * CVE-2026-13911: Insufficient data validation in Spellcheck
  * CVE-2026-13912: Incorrect security UI in Safe Browsing
  * CVE-2026-13913: Insufficient policy enforcement in Autofill
  * CVE-2026-13914: Inappropriate implementation in Passwords
  * CVE-2026-13915: Use after free in Chrome for iOS
  * CVE-2026-13916: Inappropriate implementation in Chrome for iOS
  * CVE-2026-13917: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-13918: Use after free in Chrome for iOS
  * CVE-2026-13919: Insufficient data validation in Extensions
  * CVE-2026-13920: Insufficient validation of untrusted input in Media
  * CVE-2026-13921: Insufficient validation of untrusted input in DeviceBoundSessionCredentials
  * CVE-2026-13922: Side-channel information leakage in Paint
  * CVE-2026-13923: Uninitialized Use in GPU
  * CVE-2026-13924: Insufficient validation of untrusted input in WebView
  * CVE-2026-13925: Inappropriate implementation in Downloads
  * CVE-2026-13926: Insufficient validation of untrusted input in Network
  * CVE-2026-13927: Insufficient validation of untrusted input in UI
  * CVE-2026-13928: Insufficient validation of untrusted input in Enterprise
  * CVE-2026-13929: Insufficient validation of untrusted input in DevTools
  * CVE-2026-13930: Insufficient policy enforcement in Actor
  * CVE-2026-13931: Inappropriate implementation in Media
  * CVE-2026-13932: Inappropriate implementation in Sharing
  * CVE-2026-13933: Insufficient policy enforcement in Passwords
  * CVE-2026-13934: Insufficient validation of untrusted input in Dawn
  * CVE-2026-13935: Side-channel information leakage in ComputePressure
  * CVE-2026-13936: Inappropriate implementation in Passwords
  * CVE-2026-13937: Insufficient policy enforcement in Passwords
  * CVE-2026-13938: Integer overflow in Fonts
  * CVE-2026-13939: Insufficient validation of untrusted input in WebShare
  * CVE-2026-13940: Uninitialized Use in Cast
  * CVE-2026-13941: Inappropriate implementation in SiteSettings
  * CVE-2026-13942: Insufficient validation of untrusted input in Video Capture
  * CVE-2026-13943: Uninitialized Use in CSS
  * CVE-2026-13944: Inappropriate implementation in DataTransfer
  * CVE-2026-13945: Insufficient policy enforcement in Extensions
  * CVE-2026-13946: Inappropriate implementation in ScriptInjections
  * CVE-2026-13947: Uninitialized Use in XR
  * CVE-2026-13948: Insufficient policy enforcement in Extensions
  * CVE-2026-13949: Insufficient policy enforcement in Payments
  * CVE-2026-13950: Uninitialized Use in GPU
  * CVE-2026-13951: Policy bypass in USB
  * CVE-2026-13952: Inappropriate implementation in PerformanceAPIs
  * CVE-2026-13953: Inappropriate implementation in SplitView
  * CVE-2026-13954: Insufficient policy enforcement in XML
  * CVE-2026-13955: Insufficient validation of untrusted input in CustomTabs
  * CVE-2026-13956: Incorrect security UI in PageInfo
  * CVE-2026-13957: Incorrect security UI in Extensions
  * CVE-2026-13958: Uninitialized Use in Codecs
  * CVE-2026-13959: Insufficient validation of untrusted input in Blink
  * CVE-2026-13960: Inappropriate implementation in Passwords
  * CVE-2026-13961: Insufficient validation of untrusted input in DevTools
  * CVE-2026-13962: Insufficient data validation in PDF
  * CVE-2026-13963: Inappropriate implementation in DevTools
  * CVE-2026-13964: Insufficient policy enforcement in WebView
  * CVE-2026-13965: Use after free in Oilpan
  * CVE-2026-13966: Inappropriate implementation in History
  * CVE-2026-13967: Type Confusion in V8
  * CVE-2026-13968: Insufficient validation of untrusted input in DevTools
  * CVE-2026-13969: Uninitialized Use in UI
  * CVE-2026-13970: Uninitialized Use in Media
  * CVE-2026-13971: Uninitialized Use in Skia
  * CVE-2026-13972: Inappropriate implementation in Paint
  * CVE-2026-13973: Inappropriate implementation in UI
  * CVE-2026-13974: Integer overflow in Safe Browsing
  * CVE-2026-13975: Out of bounds read in ANGLE
  * CVE-2026-13976: Heap buffer overflow in Storage
  * CVE-2026-13977: Inappropriate implementation in HTMLParser
  * CVE-2026-13978: Insufficient policy enforcement in PageInfo
  * CVE-2026-13979: Inappropriate implementation in Paint
  * CVE-2026-13980: Incorrect security UI in Chrome for iOS
  * CVE-2026-13981: Inappropriate implementation in Chrome for iOS
  * CVE-2026-13982: Incorrect security UI in Passwords
  * CVE-2026-13983: Incorrect security UI in Chrome for iOS
  * CVE-2026-13984: Incorrect security UI in TabStrip
  * CVE-2026-13985: Inappropriate implementation in MediaCapture
  * CVE-2026-13986: Inappropriate implementation in Media UI
  * CVE-2026-13987: Incorrect security UI in Mobile
  * CVE-2026-13988: Inappropriate implementation in Paint
  * CVE-2026-13989: Insufficient policy enforcement in PageInfo
  * CVE-2026-13990: Insufficient validation of untrusted input in DataTransfer
  * CVE-2026-13991: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-13992: Inappropriate implementation in UI
  * CVE-2026-13993: Incorrect security UI in WebAppInstalls
  * CVE-2026-13994: Inappropriate implementation in Credential Management
  * CVE-2026-13995: Insufficient validation of untrusted input in Autofill
  * CVE-2026-13996: Incorrect security UI in Permissions
  * CVE-2026-13997: Incorrect security UI in Extensions
  * CVE-2026-13998: Incorrect security UI in File Input
  * CVE-2026-13999: Inappropriate implementation in Extensions
  * CVE-2026-14000: Inappropriate implementation in XML
  * CVE-2026-14001: Inappropriate implementation in Network
  * CVE-2026-14002: Inappropriate implementation in Geolocation
  * CVE-2026-14003: Insufficient policy enforcement in Extensions
  * CVE-2026-14004: Inappropriate implementation in CSS
  * CVE-2026-14005: Use after free in Omnibox
  * CVE-2026-14006: Use after free in Navigation
  * CVE-2026-14007: Insufficient policy enforcement in PermissionsPolicy
  * CVE-2026-14008: Uninitialized Use in WebXR
  * CVE-2026-14009: Insufficient data validation in Passwords
  * CVE-2026-14010: Uninitialized Use in Codecs
  * CVE-2026-14011: Out of bounds read in SurfaceCapture
  * CVE-2026-14012: Side-channel information leakage in CSS
  * CVE-2026-14013: Inappropriate implementation in SVG
  * CVE-2026-14014: Inappropriate implementation in Paint
  * CVE-2026-14015: Inappropriate implementation in WebRTC
  * CVE-2026-14016: Insufficient policy enforcement in SVG
  * CVE-2026-14017: Inappropriate implementation in Navigation
  * CVE-2026-14018: Use after free in Updater
  * CVE-2026-14019: Inappropriate implementation in Passwords
  * CVE-2026-14020: Insufficient validation of untrusted input in WebXR
  * CVE-2026-14021: Insufficient validation of untrusted input in StorageAccessAPI
  * CVE-2026-14022: Insufficient validation of untrusted input in Network
  * CVE-2026-14023: Insufficient validation of untrusted input in SanitizerAPI
  * CVE-2026-14024: Use after free in Ozone
  * CVE-2026-14025: Use after free in Views
  * CVE-2026-14026: Incorrect security UI in SplitView
  * CVE-2026-14027: Use after free in SignIn
  * CVE-2026-14028: Incorrect security UI in Chrome for iOS
  * CVE-2026-14030: Incorrect security UI in SplitView
  * CVE-2026-14031: Incorrect security UI in File Input
  * CVE-2026-14032: Use after free in Bluetooth
  * CVE-2026-14033: Insufficient policy enforcement in Media
  * CVE-2026-14034: Inappropriate implementation in WebXR
  * CVE-2026-14035: Insufficient policy enforcement in Bluetooth
  * CVE-2026-14036: Insufficient policy enforcement in Bluetooth
  * CVE-2026-14037: Insufficient policy enforcement in GPU
  * CVE-2026-14038: Insufficient validation of untrusted input in New Tab Page
  * CVE-2026-14039: Insufficient policy enforcement in GetUserMedia
  * CVE-2026-14040: Use after free in BrowserTag
  * CVE-2026-14041: Insufficient policy enforcement in Serial
  * CVE-2026-14042: Inappropriate implementation in Isolated Web Apps
  * CVE-2026-14043: Use after free in GetUserMedia
  * CVE-2026-14044: Use after free in ANGLE
  * CVE-2026-14045: Insufficient validation of untrusted input in Network
  * CVE-2026-14046: Inappropriate implementation in CustomTabs
  * CVE-2026-14047: Insufficient policy enforcement in Extensions
  * CVE-2026-14048: Use after free in Chromecast
  * CVE-2026-14049: Inappropriate implementation in GPU
  * CVE-2026-14050: Insufficient policy enforcement in Passwords
  * CVE-2026-14051: Uninitialized Use in GamepadAPI
  * CVE-2026-14052: Insufficient policy enforcement in FileSystem
  * CVE-2026-14053: Insufficient policy enforcement in Extensions
  * CVE-2026-14054: Insufficient policy enforcement in Network
  * CVE-2026-14055: Insufficient validation of untrusted input in Device Trust
  * CVE-2026-14056: Insufficient validation of untrusted input in Media
  * CVE-2026-14057: Insufficient policy enforcement in FedCM
  * CVE-2026-14058: Policy bypass in Parser
  * CVE-2026-14059: Insufficient policy enforcement in Related-Website-Sets
  * CVE-2026-14060: Insufficient validation of untrusted input in Chromoting
  * CVE-2026-14061: Inappropriate implementation in Dawn
  * CVE-2026-14062: Inappropriate implementation in Views
  * CVE-2026-14063: Out of bounds memory access in Chromecast
  * CVE-2026-14064: Use after free in PageInfo
  * CVE-2026-14065: Insufficient validation of untrusted input in PageInfo
  * CVE-2026-14066: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-14067: Use after free in Chrome for iOS
  * CVE-2026-14068: Inappropriate implementation in Omnibox
  * CVE-2026-14069: Integer overflow in WebNN
  * CVE-2026-14070: Uninitialized Use in WebNN
  * CVE-2026-14071: Side-channel information leakage in WebAudio
  * CVE-2026-14072: Incorrect security UI in SplitView
  * CVE-2026-14073: Insufficient policy enforcement in WebXR
  * CVE-2026-14074: Side-channel information leakage in WebAuthentication
  * CVE-2026-14075: Policy bypass in Chrome for iOS
  * CVE-2026-14076: Policy bypass in Network
  * CVE-2026-14077: Incorrect security UI in Select
  * CVE-2026-14078: Policy bypass in WebRTC
  * CVE-2026-14079: Policy bypass in Network
  * CVE-2026-14080: Insufficient validation of untrusted input in TabSwitcher
  * CVE-2026-14081: Insufficient policy enforcement in DevTools
  * CVE-2026-14082: Race in Storage
  * CVE-2026-14083: Insufficient validation of untrusted input in HTML
  * CVE-2026-14084: Insufficient validation of untrusted input in Chromoting
  * CVE-2026-14085: Side-channel information leakage in CSS
  * CVE-2026-14086: Insufficient policy enforcement in HID
  * CVE-2026-14087: Insufficient validation of untrusted input in WebNN
  * CVE-2026-14088: Uninitialized Use in Canvas
  * CVE-2026-14089: Insufficient validation of untrusted input in PopupBlocker
  * CVE-2026-14090: Out of bounds read in CameraCapture
  * CVE-2026-14091: Use after free in DevTools
  * CVE-2026-14092: Insufficient policy enforcement in Privacy
  * CVE-2026-14093: Use after free in Cast
  * CVE-2026-14094: Use after free in Installer
  * CVE-2026-14095: Insufficient validation of untrusted input in Browser
  * CVE-2026-14096: Object lifecycle issue in Input
  * CVE-2026-14097: Inappropriate implementation in WebAppInstalls
  * CVE-2026-14098: Inappropriate implementation in CSS
  * CVE-2026-14099: Use after free in Chrome for iOS
  * CVE-2026-14100: Insufficient data validation in NetworkCache
  * CVE-2026-14101: Insufficient policy enforcement in Sandbox
  * CVE-2026-14102: Use after free in Passwords
  * CVE-2026-14103: Use after free in SSL
  * CVE-2026-14104: Insufficient validation of untrusted input in WebAppInstalls
  * CVE-2026-14105: Insufficient policy enforcement in Speech
  * CVE-2026-14106: Insufficient validation of untrusted input in Text
  * CVE-2026-14107: Use after free in Scheduling
  * CVE-2026-14108: Use after free in PDFium
  * CVE-2026-14109: Insufficient policy enforcement in Mojo
  * CVE-2026-14110: Inappropriate implementation in DarkMode
  * CVE-2026-14111: Use after free in WebProtect
  * CVE-2026-14112: Inappropriate implementation in Enterprise
  * CVE-2026-14113: Use after free in Updater
  * CVE-2026-14114: Inappropriate implementation in WebAppInstalls
  * CVE-2026-14115: Insufficient validation of untrusted input in Cast
  * CVE-2026-14116: Insufficient validation of untrusted input in DevTools
  * CVE-2026-14117: Insufficient validation of untrusted input in DevTools
  * CVE-2026-14118: Insufficient data validation in DevTools
  * CVE-2026-14119: Type Confusion in Bluetooth
  * CVE-2026-14120: Inappropriate implementation in DevTools
  * CVE-2026-14121: Use after free in Chromoting
  * CVE-2026-14122: Insufficient validation of untrusted input in WebAppInstalls
  * CVE-2026-14123: Incorrect security UI in Chrome for iOS
  * CVE-2026-14124: Inappropriate implementation in CredentialProvider
  * CVE-2026-14125: Uninitialized Use in ANGLE
  * CVE-2026-14126: Incorrect security UI in UI
  * CVE-2026-14127: Inappropriate implementation in Printing
  * CVE-2026-14128: Insufficient data validation in Chrome for iOS
  * CVE-2026-14129: Incorrect security UI in PreviewTab
  * CVE-2026-14130: Incorrect security UI in Omnibox
  * CVE-2026-14131: Insufficient validation of untrusted input in WebAppInstalls
  * CVE-2026-14132: Inappropriate implementation in WebXR
  * CVE-2026-14133: Race in History Embeddings
  * CVE-2026-14134: Inappropriate implementation in Autofill
  * CVE-2026-14135: Insufficient validation of untrusted input in Network
  * CVE-2026-14136: Incorrect security UI in Chrome for iOS
  * CVE-2026-14137: Insufficient validation of untrusted input in Chrome for iOS
  * CVE-2026-14138: Inappropriate implementation in WebAppInstalls
  * CVE-2026-14139: Inappropriate implementation in TabStrip
  * CVE-2026-14140: Insufficient validation of untrusted input in Input
  * CVE-2026-14141: Incorrect security UI in Document Picture-in-Picture
  * CVE-2026-14142: Inappropriate implementation in Extensions
  * CVE-2026-14143: Incorrect security UI in Passwords
  * CVE-2026-14144: Incorrect security UI in Views
  * CVE-2026-14145: Inappropriate implementation in CSS
  * CVE-2026-14146: Inappropriate implementation in CSS
  * CVE-2026-14147: Inappropriate implementation in CSS
  * CVE-2026-14148: Type Confusion in CSS
  * CVE-2026-14149: Use after free in Audio
  * CVE-2026-14150: Insufficient validation of untrusted input in Speech
  * CVE-2026-14151: Inappropriate implementation in AI
  * CVE-2026-14152: Out of bounds write in ANGLE
  * CVE-2026-14153: Inappropriate implementation in Glic
  * CVE-2026-14154: Inappropriate implementation in DevTools
  * CVE-2026-14155: Insufficient policy enforcement in StorageAccessAPI
  * CVE-2026-14156: Policy bypass in StorageAccessAPI
- Remove Darkmode patches, which are already included in v150
- Refresh patches for v150
- Fix FTBFS with system ffmpeg
- Backport upstream patches to fix FTBFS

---
diff --git a/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch b/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch
index 7a02ced..9433763 100644
--- a/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch
+++ b/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch
@@ -1,10 +1,10 @@
-Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
+Index: chromium-150.0.7871.46/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
 ===================================================================
 --- /dev/null
-+++ chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
++++ chromium-150.0.7871.46/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
 @@ -0,0 +1,100 @@
 +;
-+; Copyright (c) 2026, Alliance for Open Media. All rights reserved.
++; Copyright (c) 2017, Alliance for Open Media. All rights reserved.
 +;
 +; This source code is subject to the terms of the BSD 2 Clause License and
 +; the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
@@ -103,13 +103,13 @@ Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/confi
 +HAVE_VSX equ 1
 +HAVE_WXWIDGETS equ 0
 +STATIC_LINK_JXL equ 0
-Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
+Index: chromium-150.0.7871.46/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
 ===================================================================
 --- /dev/null
-+++ chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
++++ chromium-150.0.7871.46/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
 @@ -0,0 +1,13 @@
 +/*
-+ * Copyright (c) 2026, Alliance for Open Media. All rights reserved.
++ * Copyright (c) 2016, Alliance for Open Media. All rights reserved.
 + *
 + * This source code is subject to the terms of the BSD 2 Clause License and
 + * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
@@ -121,13 +121,13 @@ Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/confi
 +#include "aom/aom_codec.h"
 +static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/cmake/toolchains/ppc-linux-gcc.cmake\" -DCONFIG_AV1_DECODER=0 -DCONFIG_AV1_ENCODER=1 -DCONFIG_AV1_HIGHBITDEPTH=0 -DCONFIG_AV1_TEMPORAL_DENOISING=0 -DCONFIG_QUANT_MATRIX=0 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_DENOISE=0 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
 +const char *aom_codec_build_config(void) {return cfg;}
-Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
+Index: chromium-150.0.7871.46/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
 ===================================================================
 --- /dev/null
-+++ chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
++++ chromium-150.0.7871.46/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
 @@ -0,0 +1,103 @@
 +/*
-+ * Copyright (c) 2026, Alliance for Open Media. All rights reserved.
++ * Copyright (c) 2017, Alliance for Open Media. All rights reserved.
 + *
 + * This source code is subject to the terms of the BSD 2 Clause License and
 + * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
@@ -229,10 +229,10 @@ Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/confi
 +#define HAVE_WXWIDGETS 0
 +#define STATIC_LINK_JXL 0
 +#endif  // AOM_CONFIG_H_
-Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
+Index: chromium-150.0.7871.46/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
++++ chromium-150.0.7871.46/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
 @@ -0,0 +1,1177 @@
 +/*
 + * Copyright (c) 2017, Alliance for Open Media. All rights reserved.
@@ -1411,10 +1411,10 @@ Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/confi
 +#endif
 +
 +#endif  // AOM_DSP_RTCD_H_
-Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
+Index: chromium-150.0.7871.46/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
++++ chromium-150.0.7871.46/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
 @@ -0,0 +1,88 @@
 +/*
 + * Copyright (c) 2017, Alliance for Open Media. All rights reserved.
@@ -1504,11 +1504,11 @@ Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/confi
 +#endif
 +
 +#endif  // AOM_SCALE_RTCD_H_
-Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
+Index: chromium-150.0.7871.46/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
-@@ -0,0 +1,402 @@
++++ chromium-150.0.7871.46/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
+@@ -0,0 +1,405 @@
 +/*
 + * Copyright (c) 2017, Alliance for Open Media. All rights reserved.
 + *
@@ -1747,6 +1747,9 @@ Index: chromium-149.0.7827.53/third_party/libaom/source/config/linux/ppc64/confi
 +void av1_highbd_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int bd);
 +#define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
 +
++void av1_interp_cubic_rate_dist_c(const double *p1, const double *p2, double x, double rate_dist_f[2]);
++#define av1_interp_cubic_rate_dist av1_interp_cubic_rate_dist_c
++
 +void av1_inv_txfm2d_add_16x16_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
 +#define av1_inv_txfm2d_add_16x16 av1_inv_txfm2d_add_16x16_c
 +

diff --git a/0002-regenerate-xnn-buildgn.patch b/0002-regenerate-xnn-buildgn.patch
index f54c078..18823db 100644
--- a/0002-regenerate-xnn-buildgn.patch
+++ b/0002-regenerate-xnn-buildgn.patch
@@ -7,10 +7,11 @@ 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
 
-diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
---- a/third_party/xnnpack/BUILD.gn
-+++ n/third_party/xnnpack/BUILD.gn
-@@ -34,10 +34,10 @@
+Index: chromium-150.0.7871.46/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
+@@ -34,10 +34,10 @@ config("xnnpack_public_config") {
    }
  
    defines = [
@@ -25,7 +26,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  }
  
  config("xnnpack_private_config") {
-@@ -48,1990 +48,2292 @@
+@@ -48,2068 +48,2352 @@ config("xnnpack_private_config") {
    ]
  }
  
@@ -34,6 +35,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +  if (build_with_chromium) {
 +    xnnpack_deps = [
++    ":bf16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 +    ":bf16-f32-vcvt_x64",
 +    ":bf16-qs8-vcvt_x64",
 +    ":bf16-rminmax_x64",
@@ -77,6 +79,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f16-vexp_x64",
 +    ":f16-vgelu_x64",
 +    ":f16-vhswish_f16c-no-avx2-no-fma",
++    ":f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
++    ":f16-vlog_x64",
 +    ":f16-vlrelu_f16c-no-avx2-no-fma",
 +    ":f16-vmulcaddc_f16c-fma-no-avx2",
 +    ":f16-vrnd_f16c-no-avx2-no-fma",
@@ -84,8 +88,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f16-vsigmoid_f16c-fma-avx2",
 +    ":f16-vsin_x64",
 +    ":f16-vsqrt_f16c-no-avx2-no-fma",
++    ":f16-vsqrt_x64",
++    ":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",
 +    ":f16-vunary_sse2-no-sse3",
 +    ":f32-argmaxpool_sse2-no-sse3",
@@ -94,6 +101,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f32-avgpool_avx512f",
 +    ":f32-avgpool_sse2-no-sse3",
 +    ":f32-avgpool_x64",
++    ":f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
++    ":f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16",
 +    ":f32-bf16-vcvt_x64",
 +    ":f32-conv-hwc2chw_sse-no-sse2",
 +    ":f32-conv-hwc2chw_x64",
@@ -569,6 +578,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +  if (build_with_internal_optimization_guide) {
 +    xnnpack_standalone_deps = [
++    ":bf16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 +    ":bf16-f32-vcvt_x64_standalone",
 +    ":bf16-qs8-vcvt_x64_standalone",
 +    ":bf16-rminmax_x64_standalone",
@@ -612,6 +622,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f16-vexp_x64_standalone",
 +    ":f16-vgelu_x64_standalone",
 +    ":f16-vhswish_f16c-no-avx2-no-fma_standalone",
++    ":f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
++    ":f16-vlog_x64_standalone",
 +    ":f16-vlrelu_f16c-no-avx2-no-fma_standalone",
 +    ":f16-vmulcaddc_f16c-fma-no-avx2_standalone",
 +    ":f16-vrnd_f16c-no-avx2-no-fma_standalone",
@@ -619,8 +631,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f16-vsigmoid_f16c-fma-avx2_standalone",
 +    ":f16-vsin_x64_standalone",
 +    ":f16-vsqrt_f16c-no-avx2-no-fma_standalone",
++    ":f16-vsqrt_x64_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",
 +    ":f16-vunary_sse2-no-sse3_standalone",
 +    ":f32-argmaxpool_sse2-no-sse3_standalone",
@@ -629,6 +644,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f32-avgpool_avx512f_standalone",
 +    ":f32-avgpool_sse2-no-sse3_standalone",
 +    ":f32-avgpool_x64_standalone",
++    ":f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
++    ":f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16_standalone",
 +    ":f32-bf16-vcvt_x64_standalone",
 +    ":f32-conv-hwc2chw_sse-no-sse2_standalone",
 +    ":f32-conv-hwc2chw_x64_standalone",
@@ -1106,6 +1123,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
    if (build_with_chromium) {
      xnnpack_deps = [
+-      ":bf16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 -      ":bf16-f32-vcvt_x64",
 -      ":bf16-qs8-vcvt_x64",
 -      ":bf16-rminmax_x64",
@@ -1149,6 +1167,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f16-vexp_x64",
 -      ":f16-vgelu_x64",
 -      ":f16-vhswish_f16c-no-avx2-no-fma",
+-      ":f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
+-      ":f16-vlog_x64",
 -      ":f16-vlrelu_f16c-no-avx2-no-fma",
 -      ":f16-vmulcaddc_f16c-fma-no-avx2",
 -      ":f16-vrnd_f16c-no-avx2-no-fma",
@@ -1156,8 +1176,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f16-vsigmoid_f16c-fma-avx2",
 -      ":f16-vsin_x64",
 -      ":f16-vsqrt_f16c-no-avx2-no-fma",
+-      ":f16-vsqrt_x64",
+-      ":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",
 -      ":f16-vunary_sse2-no-sse3",
 -      ":f32-argmaxpool_sse2-no-sse3",
@@ -1166,6 +1189,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f32-avgpool_avx512f",
 -      ":f32-avgpool_sse2-no-sse3",
 -      ":f32-avgpool_x64",
+-      ":f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
+-      ":f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16",
 -      ":f32-bf16-vcvt_x64",
 -      ":f32-conv-hwc2chw_sse-no-sse2",
 -      ":f32-conv-hwc2chw_x64",
@@ -1679,6 +1704,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f16-vgelu_arch=armv8.2-a+fp16",
 +    ":f16-vgelu_arm64",
 +    ":f16-vhswish_arch=armv8.2-a+fp16",
++    ":f16-vlog_arch=armv8.2-a+fp16",
++    ":f16-vlog_arm64",
 +    ":f16-vlrelu_arch=armv8.2-a+fp16",
 +    ":f16-vmulcaddc_arch=armv8.2-a+fp16",
 +    ":f16-vrnd_arch=armv8.2-a+fp16",
@@ -1687,7 +1714,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f16-vsin_arch=armv8.2-a+fp16",
 +    ":f16-vsin_arm64",
 +    ":f16-vsqrt_arch=armv8.2-a+fp16",
++    ":f16-vsqrt_arm64",
 +    ":f16-vtanh_arch=armv8.2-a+fp16",
++    ":f16-vtanh_arm64",
 +    ":f16-vunary_arch=armv8.2-a+fp16",
 +    ":f32-argmaxpool_arm64",
 +    ":f32-avgpool_arm64",
@@ -1871,6 +1900,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
    if (build_with_internal_optimization_guide) {
      xnnpack_standalone_deps = [
+-      ":bf16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 -      ":bf16-f32-vcvt_x64_standalone",
 -      ":bf16-qs8-vcvt_x64_standalone",
 -      ":bf16-rminmax_x64_standalone",
@@ -1914,6 +1944,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f16-vexp_x64_standalone",
 -      ":f16-vgelu_x64_standalone",
 -      ":f16-vhswish_f16c-no-avx2-no-fma_standalone",
+-      ":f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
+-      ":f16-vlog_x64_standalone",
 -      ":f16-vlrelu_f16c-no-avx2-no-fma_standalone",
 -      ":f16-vmulcaddc_f16c-fma-no-avx2_standalone",
 -      ":f16-vrnd_f16c-no-avx2-no-fma_standalone",
@@ -1921,8 +1953,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f16-vsigmoid_f16c-fma-avx2_standalone",
 -      ":f16-vsin_x64_standalone",
 -      ":f16-vsqrt_f16c-no-avx2-no-fma_standalone",
+-      ":f16-vsqrt_x64_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",
 -      ":f16-vunary_sse2-no-sse3_standalone",
 -      ":f32-argmaxpool_sse2-no-sse3_standalone",
@@ -1931,6 +1966,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f32-avgpool_avx512f_standalone",
 -      ":f32-avgpool_sse2-no-sse3_standalone",
 -      ":f32-avgpool_x64_standalone",
+-      ":f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16_standalone",
+-      ":f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 -      ":f32-bf16-vcvt_x64_standalone",
 -      ":f32-conv-hwc2chw_sse-no-sse2_standalone",
 -      ":f32-conv-hwc2chw_x64_standalone",
@@ -2444,6 +2481,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f16-vgelu_arch=armv8.2-a+fp16_standalone",
 +    ":f16-vgelu_arm64_standalone",
 +    ":f16-vhswish_arch=armv8.2-a+fp16_standalone",
++    ":f16-vlog_arch=armv8.2-a+fp16_standalone",
++    ":f16-vlog_arm64_standalone",
 +    ":f16-vlrelu_arch=armv8.2-a+fp16_standalone",
 +    ":f16-vmulcaddc_arch=armv8.2-a+fp16_standalone",
 +    ":f16-vrnd_arch=armv8.2-a+fp16_standalone",
@@ -2452,7 +2491,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f16-vsin_arch=armv8.2-a+fp16_standalone",
 +    ":f16-vsin_arm64_standalone",
 +    ":f16-vsqrt_arch=armv8.2-a+fp16_standalone",
++    ":f16-vsqrt_arm64_standalone",
 +    ":f16-vtanh_arch=armv8.2-a+fp16_standalone",
++    ":f16-vtanh_arm64_standalone",
 +    ":f16-vunary_arch=armv8.2-a+fp16_standalone",
 +    ":f32-argmaxpool_arm64_standalone",
 +    ":f32-avgpool_arm64_standalone",
@@ -2682,6 +2723,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f16-vgelu_arch=armv8.2-a+fp16",
 -      ":f16-vgelu_arm64",
 -      ":f16-vhswish_arch=armv8.2-a+fp16",
+-      ":f16-vlog_arch=armv8.2-a+fp16",
+-      ":f16-vlog_arm64",
 -      ":f16-vlrelu_arch=armv8.2-a+fp16",
 -      ":f16-vmulcaddc_arch=armv8.2-a+fp16",
 -      ":f16-vrnd_arch=armv8.2-a+fp16",
@@ -2690,7 +2733,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f16-vsin_arch=armv8.2-a+fp16",
 -      ":f16-vsin_arm64",
 -      ":f16-vsqrt_arch=armv8.2-a+fp16",
+-      ":f16-vsqrt_arm64",
 -      ":f16-vtanh_arch=armv8.2-a+fp16",
+-      ":f16-vtanh_arm64",
 -      ":f16-vunary_arch=armv8.2-a+fp16",
 -      ":f32-argmaxpool_arm64",
 -      ":f32-avgpool_arm64",
@@ -2893,19 +2938,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
++    ":f16-vcmul_arch=rv64gc_zvfh-abi=lp64d",
++    ":f16-vcos_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-vcos_riscv64",
++    ":f16-velu_arch=rv64gc_zvfh-abi=lp64d",
++    ":f16-vexp_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-vexp_riscv64",
++    ":f16-vgelu_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-vgelu_riscv64",
 +    ":f16-vhswish_arch=rv64gc_zvfh-abi=lp64d",
++    ":f16-vlog_riscv64",
 +    ":f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-vrnd_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d",
++    ":f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d",
++    ":f16-vsin_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-vsin_riscv64",
 +    ":f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d",
++    ":f16-vsqrt_riscv64",
++    ":f16-vtanh_arch=rv64gc_zvfh-abi=lp64d",
++    ":f16-vtanh_riscv64",
 +    ":f16-vunary_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f32-argmaxpool_arch=rv64gcv-abi=lp64d",
 +    ":f32-argmaxpool_riscv64",
@@ -2950,6 +3007,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f32-rsum_riscv64",
 +    ":f32-spmm_arch=rv64gcv-abi=lp64d",
 +    ":f32-spmm_riscv64",
++    ":f32-vapproxgelu_arch=rv64gcv-abi=lp64d",
 +    ":f32-vapproxgelu_riscv64",
 +    ":f32-vbinary_arch=rv64gcv-abi=lp64d",
 +    ":f32-vbinary_riscv64",
@@ -2961,9 +3019,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f32-vcopysign_riscv64",
 +    ":f32-vcos_arch=rv64gcv-abi=lp64d",
 +    ":f32-vcos_riscv64",
++    ":f32-velu_arch=rv64gcv-abi=lp64d",
 +    ":f32-velu_riscv64",
 +    ":f32-vexp_arch=rv64gcv-abi=lp64d",
 +    ":f32-vexp_riscv64",
++    ":f32-vgelu_arch=rv64gcv-abi=lp64d",
 +    ":f32-vgelu_riscv64",
 +    ":f32-vhswish_arch=rv64gcv-abi=lp64d",
 +    ":f32-vhswish_riscv64",
@@ -3147,6 +3207,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f16-vgelu_arch=armv8.2-a+fp16_standalone",
 -      ":f16-vgelu_arm64_standalone",
 -      ":f16-vhswish_arch=armv8.2-a+fp16_standalone",
+-      ":f16-vlog_arch=armv8.2-a+fp16_standalone",
+-      ":f16-vlog_arm64_standalone",
 -      ":f16-vlrelu_arch=armv8.2-a+fp16_standalone",
 -      ":f16-vmulcaddc_arch=armv8.2-a+fp16_standalone",
 -      ":f16-vrnd_arch=armv8.2-a+fp16_standalone",
@@ -3155,7 +3217,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f16-vsin_arch=armv8.2-a+fp16_standalone",
 -      ":f16-vsin_arm64_standalone",
 -      ":f16-vsqrt_arch=armv8.2-a+fp16_standalone",
+-      ":f16-vsqrt_arm64_standalone",
 -      ":f16-vtanh_arch=armv8.2-a+fp16_standalone",
+-      ":f16-vtanh_arm64_standalone",
 -      ":f16-vunary_arch=armv8.2-a+fp16_standalone",
 -      ":f32-argmaxpool_arm64_standalone",
 -      ":f32-avgpool_arm64_standalone",
@@ -3358,19 +3422,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
++    ":f16-vcmul_arch=rv64gc_zvfh-abi=lp64d_standalone",
++    ":f16-vcos_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f16-vcos_riscv64_standalone",
++    ":f16-velu_arch=rv64gc_zvfh-abi=lp64d_standalone",
++    ":f16-vexp_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f16-vexp_riscv64_standalone",
++    ":f16-vgelu_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f16-vgelu_riscv64_standalone",
 +    ":f16-vhswish_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",
 +    ":f16-vrnd_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone",
++    ":f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d_standalone",
++    ":f16-vsin_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f16-vsin_riscv64_standalone",
 +    ":f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone",
++    ":f16-vsqrt_riscv64_standalone",
++    ":f16-vtanh_arch=rv64gc_zvfh-abi=lp64d_standalone",
++    ":f16-vtanh_riscv64_standalone",
 +    ":f16-vunary_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone",
 +    ":f32-argmaxpool_riscv64_standalone",
@@ -3415,6 +3491,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f32-rsum_riscv64_standalone",
 +    ":f32-spmm_arch=rv64gcv-abi=lp64d_standalone",
 +    ":f32-spmm_riscv64_standalone",
++    ":f32-vapproxgelu_arch=rv64gcv-abi=lp64d_standalone",
 +    ":f32-vapproxgelu_riscv64_standalone",
 +    ":f32-vbinary_arch=rv64gcv-abi=lp64d_standalone",
 +    ":f32-vbinary_riscv64_standalone",
@@ -3426,9 +3503,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f32-vcopysign_riscv64_standalone",
 +    ":f32-vcos_arch=rv64gcv-abi=lp64d_standalone",
 +    ":f32-vcos_riscv64_standalone",
++    ":f32-velu_arch=rv64gcv-abi=lp64d_standalone",
 +    ":f32-velu_riscv64_standalone",
 +    ":f32-vexp_arch=rv64gcv-abi=lp64d_standalone",
 +    ":f32-vexp_riscv64_standalone",
++    ":f32-vgelu_arch=rv64gcv-abi=lp64d_standalone",
 +    ":f32-vgelu_riscv64_standalone",
 +    ":f32-vhswish_arch=rv64gcv-abi=lp64d_standalone",
 +    ":f32-vhswish_riscv64_standalone",
@@ -3577,6 +3656,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":bf16-rminmax_riscv64",
 -      ":configs_riscv64",
 -      ":enums_riscv64",
+-      ":f16-avgpool_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-dwconv_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-f32-vcvt_riscv64",
@@ -3586,6 +3666,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-gemm_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-igemm_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-maxpool_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-qs8-vcvt_riscv64",
 -      ":f16-qu8-vcvt_riscv64",
 -      ":f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d",
@@ -3594,21 +3675,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
+-      ":f16-vcmul_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-vcos_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-vcos_riscv64",
+-      ":f16-velu_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-vexp_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-vexp_riscv64",
+-      ":f16-vgelu_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-vgelu_riscv64",
 -      ":f16-vhswish_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-vlog_riscv64",
 -      ":f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-vrnd_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-vsin_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-vsin_riscv64",
 -      ":f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-vsqrt_riscv64",
+-      ":f16-vtanh_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-vtanh_riscv64",
 -      ":f16-vunary_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f32-argmaxpool_arch=rv64gcv-abi=lp64d",
 -      ":f32-argmaxpool_riscv64",
+-      ":f32-avgpool_arch=rv64gcv-abi=lp64d",
 -      ":f32-avgpool_riscv64",
 -      ":f32-bf16-vcvt_riscv64",
 -      ":f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d",
@@ -3649,6 +3744,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f32-rsum_riscv64",
 -      ":f32-spmm_arch=rv64gcv-abi=lp64d",
 -      ":f32-spmm_riscv64",
+-      ":f32-vapproxgelu_arch=rv64gcv-abi=lp64d",
 -      ":f32-vapproxgelu_riscv64",
 -      ":f32-vbinary_arch=rv64gcv-abi=lp64d",
 -      ":f32-vbinary_riscv64",
@@ -3658,12 +3754,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f32-vcmul_riscv64",
 -      ":f32-vcopysign_arch=rv64gcv-abi=lp64d",
 -      ":f32-vcopysign_riscv64",
+-      ":f32-vcos_arch=rv64gcv-abi=lp64d",
 -      ":f32-vcos_riscv64",
+-      ":f32-velu_arch=rv64gcv-abi=lp64d",
 -      ":f32-velu_riscv64",
+-      ":f32-vexp_arch=rv64gcv-abi=lp64d",
 -      ":f32-vexp_riscv64",
+-      ":f32-vgelu_arch=rv64gcv-abi=lp64d",
 -      ":f32-vgelu_riscv64",
 -      ":f32-vhswish_arch=rv64gcv-abi=lp64d",
 -      ":f32-vhswish_riscv64",
+-      ":f32-vlog_arch=rv64gcv-abi=lp64d",
 -      ":f32-vlog_riscv64",
 -      ":f32-vlrelu_arch=rv64gcv-abi=lp64d",
 -      ":f32-vlrelu_riscv64",
@@ -3673,10 +3774,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f32-vrnd_riscv64",
 -      ":f32-vrsqrt_arch=rv64gcv-abi=lp64d",
 -      ":f32-vrsqrt_riscv64",
+-      ":f32-vsigmoid_arch=rv64gcv-abi=lp64d",
 -      ":f32-vsigmoid_riscv64",
+-      ":f32-vsin_arch=rv64gcv-abi=lp64d",
 -      ":f32-vsin_riscv64",
 -      ":f32-vsqrt_arch=rv64gcv-abi=lp64d",
 -      ":f32-vsqrt_riscv64",
+-      ":f32-vtanh_arch=rv64gcv-abi=lp64d",
 -      ":f32-vtanh_riscv64",
 -      ":f32-vunary_arch=rv64gcv-abi=lp64d",
 -      ":f32-vunary_riscv64",
@@ -3755,6 +3859,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":qu8-vrpreluc_riscv64",
 -      ":reference_riscv64",
 -      ":s8-ibilinear_riscv64",
+-      ":s8-maxpool_arch=rv64gcv-abi=lp64d",
 -      ":s8-maxpool_riscv64",
 -      ":s8-rdminmax_arch=rv64gcv-abi=lp64d",
 -      ":s8-rdminmax_riscv64",
@@ -3766,6 +3871,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":tables_riscv64",
 -      ":u8-ibilinear_riscv64",
 -      ":u8-lut32norm_riscv64",
+-      ":u8-maxpool_arch=rv64gcv-abi=lp64d",
 -      ":u8-maxpool_riscv64",
 -      ":u8-rdminmax_arch=rv64gcv-abi=lp64d",
 -      ":u8-rdminmax_riscv64",
@@ -3804,7 +3910,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f16-vcos_ppc64",
 +    ":f16-vexp_ppc64",
 +    ":f16-vgelu_ppc64",
++    ":f16-vlog_ppc64",
 +    ":f16-vsin_ppc64",
++    ":f16-vsqrt_ppc64",
++    ":f16-vtanh_ppc64",
 +    ":f32-argmaxpool_ppc64",
 +    ":f32-avgpool_ppc64",
 +    ":f32-bf16-vcvt_ppc64",
@@ -3930,6 +4039,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":bf16-rminmax_riscv64_standalone",
 -      ":configs_riscv64_standalone",
 -      ":enums_riscv64_standalone",
+-      ":f16-avgpool_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-dwconv_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-f32-vcvt_riscv64_standalone",
@@ -3939,6 +4049,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone",
+-      ":f16-maxpool_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-qs8-vcvt_riscv64_standalone",
 -      ":f16-qu8-vcvt_riscv64_standalone",
 -      ":f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d_standalone",
@@ -3947,21 +4058,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
+-      ":f16-vcmul_arch=rv64gc_zvfh-abi=lp64d_standalone",
+-      ":f16-vcos_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-vcos_riscv64_standalone",
+-      ":f16-velu_arch=rv64gc_zvfh-abi=lp64d_standalone",
+-      ":f16-vexp_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-vexp_riscv64_standalone",
+-      ":f16-vgelu_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-vgelu_riscv64_standalone",
 -      ":f16-vhswish_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",
 -      ":f16-vrnd_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone",
+-      ":f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d_standalone",
+-      ":f16-vsin_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-vsin_riscv64_standalone",
 -      ":f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone",
+-      ":f16-vsqrt_riscv64_standalone",
+-      ":f16-vtanh_arch=rv64gc_zvfh-abi=lp64d_standalone",
+-      ":f16-vtanh_riscv64_standalone",
 -      ":f16-vunary_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-argmaxpool_riscv64_standalone",
+-      ":f32-avgpool_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-avgpool_riscv64_standalone",
 -      ":f32-bf16-vcvt_riscv64_standalone",
 -      ":f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone",
@@ -4002,6 +4127,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f32-rsum_riscv64_standalone",
 -      ":f32-spmm_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-spmm_riscv64_standalone",
+-      ":f32-vapproxgelu_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vapproxgelu_riscv64_standalone",
 -      ":f32-vbinary_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vbinary_riscv64_standalone",
@@ -4011,12 +4137,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f32-vcmul_riscv64_standalone",
 -      ":f32-vcopysign_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vcopysign_riscv64_standalone",
+-      ":f32-vcos_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vcos_riscv64_standalone",
+-      ":f32-velu_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-velu_riscv64_standalone",
+-      ":f32-vexp_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vexp_riscv64_standalone",
+-      ":f32-vgelu_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vgelu_riscv64_standalone",
 -      ":f32-vhswish_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vhswish_riscv64_standalone",
+-      ":f32-vlog_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vlog_riscv64_standalone",
 -      ":f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vlrelu_riscv64_standalone",
@@ -4026,10 +4157,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":f32-vrnd_riscv64_standalone",
 -      ":f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vrsqrt_riscv64_standalone",
+-      ":f32-vsigmoid_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vsigmoid_riscv64_standalone",
+-      ":f32-vsin_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vsin_riscv64_standalone",
 -      ":f32-vsqrt_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vsqrt_riscv64_standalone",
+-      ":f32-vtanh_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vtanh_riscv64_standalone",
 -      ":f32-vunary_arch=rv64gcv-abi=lp64d_standalone",
 -      ":f32-vunary_riscv64_standalone",
@@ -4108,6 +4242,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":qu8-vrpreluc_riscv64_standalone",
 -      ":reference_riscv64_standalone",
 -      ":s8-ibilinear_riscv64_standalone",
+-      ":s8-maxpool_arch=rv64gcv-abi=lp64d_standalone",
 -      ":s8-maxpool_riscv64_standalone",
 -      ":s8-rdminmax_arch=rv64gcv-abi=lp64d_standalone",
 -      ":s8-rdminmax_riscv64_standalone",
@@ -4119,6 +4254,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ":tables_riscv64_standalone",
 -      ":u8-ibilinear_riscv64_standalone",
 -      ":u8-lut32norm_riscv64_standalone",
+-      ":u8-maxpool_arch=rv64gcv-abi=lp64d_standalone",
 -      ":u8-maxpool_riscv64_standalone",
 -      ":u8-rdminmax_arch=rv64gcv-abi=lp64d_standalone",
 -      ":u8-rdminmax_riscv64_standalone",
@@ -4157,7 +4293,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ":f16-vcos_ppc64_standalone",
 +    ":f16-vexp_ppc64_standalone",
 +    ":f16-vgelu_ppc64_standalone",
++    ":f16-vlog_ppc64_standalone",
 +    ":f16-vsin_ppc64_standalone",
++    ":f16-vsqrt_ppc64_standalone",
++    ":f16-vtanh_ppc64_standalone",
 +    ":f32-argmaxpool_ppc64_standalone",
 +    ":f32-avgpool_ppc64_standalone",
 +    ":f32-bf16-vcvt_ppc64_standalone",
@@ -4276,7 +4415,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
      ]
    }
  } else {
-@@ -2041,6 +2343,7 @@
+@@ -2119,6 +2403,7 @@ if (current_cpu == "x64" || current_cpu
    }
  }
  
@@ -4284,7 +4423,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  if (build_with_chromium) {
    source_set("xnnpack") {
      public = [ "src/include/xnnpack.h" ]
-@@ -2051,38 +2354,38 @@
+@@ -2129,38 +2414,38 @@ if (build_with_chromium) {
      configs += [ ":xnnpack_private_config" ]
  
      sources = [
@@ -4351,7 +4490,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
      public_configs = [ ":xnnpack_public_config" ]
    }
-@@ -2099,38 +2402,38 @@
+@@ -2177,38 +2462,38 @@ if (build_with_internal_optimization_gui
      configs += [ ":xnnpack_private_config" ]
  
      sources = [
@@ -4418,17 +4557,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
      public_configs = [ ":xnnpack_public_config" ]
  
-@@ -2141,60925 +2444,71699 @@
+@@ -2219,63328 +2504,73573 @@ if (build_with_internal_optimization_gui
  }
  
  if (current_cpu == "x64" || current_cpu == "x86") {
 -  if (build_with_chromium) {
--    source_set("bf16-f32-vcvt_x64") {
--      cflags = []
+-    source_set(
+-        "bf16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c",
+-        "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-avx512skx-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -4443,14 +4591,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("bf16-f32-vcvt_x64") {
++  source_set("bf16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-avx512skx-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -4463,18 +4617,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("bf16-f32-vcvt_x64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set(
+-        "bf16-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/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c",
+-        "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-avx512skx-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -4495,28 +4652,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("bf16-qs8-vcvt_x64") {
+-    source_set("bf16-f32-vcvt_x64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-f32-vcvt_x64_standalone") {
++  source_set("bf16-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/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-avx512skx-u16.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -4551,22 +4721,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("bf16-qs8-vcvt_x64_standalone") {
+-    source_set("bf16-f32-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("bf16-qs8-vcvt_x64") {
++  source_set("bf16-f32-vcvt_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -4594,7 +4764,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("bf16-rminmax_x64") {
+-    source_set("bf16-qs8-vcvt_x64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -4605,9 +4775,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -4619,14 +4787,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_x64_standalone") {
++  source_set("bf16-f32-vcvt_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
  
 -      deps = [
@@ -4652,15 +4820,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("bf16-rminmax_x64_standalone") {
+-    source_set("bf16-qs8-vcvt_x64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
+-        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -4687,11 +4853,113 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("configs_x64") {
+-    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("bf16-qs8-vcvt_x64") {
++    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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//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("bf16-rminmax_x64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("bf16-qs8-vcvt_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "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" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("configs_x64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
 -        "src/src/configs/argmaxpool-config.c",
 -        "src/src/configs/avgpool-config.c",
 -        "src/src/configs/binary-elementwise-config.c",
@@ -4729,6 +4997,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("configs_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("bf16-rminmax_x64") {
 +    cflags = [
@@ -4742,25 +5023,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("configs_x64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/configs/argmaxpool-config.c",
@@ -4807,6 +5069,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
@@ -6718,16 +6992,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_chromium) {
 -    source_set("f16-qs8-vcvt_x64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f16-f32-vcvt_sse2-no-sse3_standalone") {
@@ -6741,20 +7005,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse2-int16-u32.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -6762,11 +7025,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-qs8-vcvt_x64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("f16-f32-vcvt_sse4.1-no-sse4.2") {
++    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse41-int16-u16.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -6790,22 +7078,38 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-qu8-vcvt_x64") {
 -      cflags = []
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_sse4.1-no-sse4.2") {
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -6816,50 +7120,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse41-int16-u16.c"
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-qu8-vcvt_x64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_sse4.1-no-sse4.2_standalone") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse41-int16-u16.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -6883,12 +7169,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-raddstoreexpminusmax_f16c-fma-avx2") {
@@ -6914,17 +7199,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++if (build_with_chromium) {
++  source_set("f16-f32-vcvt_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.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) {
@@ -6957,61 +7249,85 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-rdminmax_x64") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32-vcvt_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
 -        "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-rdminmax_x64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++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 = [
@@ -7038,9 +7354,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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(
@@ -7073,25 +7391,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    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) {
@@ -7133,11 +7444,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -7174,14 +7493,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -7224,21 +7549,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+if (build_with_chromium) {
-+  source_set("f16-f32acc-gemm_f16c-fma-avx2") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-1x16-minmax-avx2-broadcast.c",
-+    "src/src/f16-f32acc-gemm/gen/f16-f32acc-gemm-4x16-minmax-avx2-broadcast.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f16-rminmax_f16c-no-avx2-no-fma") {
@@ -7264,20 +7581,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++if (build_with_chromium) {
++  source_set("f16-f32acc-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"
++    ]
  
 -      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) {
@@ -7311,6 +7635,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
@@ -7318,21 +7649,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_chromium) {
 -    source_set("f16-rminmax_x64") {
 -      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" ]
 +# 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-igemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -7341,24 +7660,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c",
++    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-      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" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -7366,11 +7686,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rminmax_x64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -7396,63 +7746,94 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vapproxgelu_x64") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-vapproxgelu/gen/f16-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",
 -      ]
-+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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vapproxgelu_x64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++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"
 +    ]
  
 -      sources = [
@@ -7478,9 +7859,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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(
@@ -7532,28 +7915,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-igemm_f16c-fma-avx2_standalone") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c",
-+    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    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) {
@@ -7614,11 +7987,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma_standalone") {
++    cflags = [
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -7663,14 +8043,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -7721,24 +8107,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vclamp_f16c-no-avx2-no-fma") {
@@ -7764,20 +8139,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++if (build_with_chromium) {
++  source_set("f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
++    ]
  
 -      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) {
@@ -7811,6 +8196,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
@@ -7820,7 +8212,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -7833,7 +8225,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
 +    ]
  
 -      sources = [
@@ -7901,7 +8293,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma") {
++  source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -7910,7 +8302,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -7991,19 +8383,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_chromium) {
 -    source_set("f16-vexp_x64") {
 -      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" ]
 +# 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-rdsum_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -8012,23 +8394,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-      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" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -8036,11 +8417,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vexp_x64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -8064,34 +8475,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vgelu_x64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -8104,26 +8510,59 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c"
 +    ]
  
--      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" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-vgelu_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" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vgelu_x64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma") {
++    cflags = [
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c"
 +    ]
  
 -      sources = [
@@ -8149,9 +8588,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-vhswish_f16c-no-avx2-no-fma") {
@@ -8177,31 +8618,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -8236,6 +8664,60 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
++    cflags = [
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "f16-vlog_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-vlog/gen/f16-vlog-avx512fp16-rational-3-3-div.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -8243,6 +8725,157 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "f16-vlog_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-vlog/gen/f16-vlog-avx512fp16-rational-3-3-div.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-vlog_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++    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" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//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-vlog_x64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++    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"
++    ]
+ 
+-      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" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/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-vlrelu_f16c-no-avx2-no-fma") {
 -      cflags = [
@@ -8267,14 +8900,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -8307,20 +8943,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+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"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vmulcaddc_f16c-fma-no-avx2") {
@@ -8346,20 +8973,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++if (build_with_chromium) {
++  source_set("f16-f32acc-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"
++    ]
  
 -      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) {
@@ -8393,6 +9026,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
@@ -8426,7 +9066,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -8435,7 +9075,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -8556,20 +9196,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-ibilinear_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c"
++      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -8652,20 +9288,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-ibilinear_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c"
++      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
 +    ]
  
 -      sources = [
@@ -8707,22 +9339,190 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vsin_x64_standalone") {
 -      cflags = []
+-
+-      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" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma") {
++  source_set("f16-maxpool_f16c-fma-avx2") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("f16-vsqrt_f16c-no-avx2-no-fma") {
+-      cflags = [
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vsqrt_f16c-no-avx2-no-fma_standalone") {
+-      cflags = [
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-vsqrt_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-maxpool_f16c-fma-avx2_standalone") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && 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"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -8750,16 +9550,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vsqrt_f16c-no-avx2-no-fma") {
+-    source_set(
+-        "f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-expm1minus-rr1-p3h2ts-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -8788,16 +9596,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # 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-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-expm1minus-rr1-p3h2ts-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -8821,16 +9637,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-maxpool_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -8936,20 +9751,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-qs8-vcvt_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -9004,16 +9813,63 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vunary_f16c-no-avx2-no-fma") {
--      cflags = [
--        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-    source_set("f16-vtanh_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-qs8-vcvt_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vtanh_x64_standalone") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9025,34 +9881,66 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++if (build_with_chromium) {
++  source_set("f16-qu8-vcvt_x64") {
 +    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"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-  if (build_with_chromium) {
+-    source_set("f16-vunary_f16c-no-avx2-no-fma") {
+-      cflags = [
+-        "-mf16c",
+-        "-mno-avx2",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vunary_f16c-no-avx2-no-fma_standalone") {
@@ -9085,13 +9973,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vunary_sse2-no-sse3") {
@@ -9117,14 +10001,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-qu8-vcvt_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -9159,18 +10050,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+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" ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-argmaxpool_sse2-no-sse3") {
@@ -9195,21 +10078,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-argmaxpool_sse2-no-sse3_standalone") {
@@ -9240,47 +10120,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-argmaxpool_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -9288,12 +10162,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
@@ -9301,7 +10179,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-argmaxpool_x64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
@@ -9326,18 +10217,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f16-ibilinear_f16c-fma-no-avx2") {
-+    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma") {
@@ -9364,21 +10247,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-avgpool_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -9411,47 +10291,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-avgpool_avx512f") {
 -      cflags = [ "-mavx512f" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-ibilinear_f16c-fma-no-avx2_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-rdminmax_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -9459,12 +10332,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
@@ -9472,7 +10349,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-avgpool_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-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-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c",
@@ -9497,18 +10386,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f16-maxpool_f16c-fma-avx2") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-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" ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-avgpool_sse2-no-sse3") {
@@ -9533,21 +10414,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-avgpool_sse2-no-sse3_standalone") {
@@ -9578,47 +10456,47 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-avgpool_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-maxpool_f16c-fma-avx2_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "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") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
++      "src/src/f16-rminmax/gen/f16-rmax-avx512skx-u64-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-avx512skx-u64-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-avx512skx-u64-acc4.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -9626,12 +10504,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
@@ -9639,16 +10521,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-avgpool_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f16-maxpool_sse4.1-no-sse4.2") {
++# 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 = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
++      "src/src/f16-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 = [
@@ -9681,54 +10571,34 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-bf16-vcvt_x64") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    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-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-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-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"
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -9736,15 +10606,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-bf16-vcvt_x64_standalone") {
--      cflags = []
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    public_configs = [ ":xnnpack_public_config" ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "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-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512skx-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9771,15 +10654,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-conv-hwc2chw_sse-no-sse2") {
+-    source_set(
+-        "f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16") {
 -      cflags = [
--        "-mno-sse2",
--        "-msse",
+-        "-mavx512bf16",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512bf16-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9794,14 +10686,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_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-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -9814,15 +10717,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-conv-hwc2chw_sse-no-sse2_standalone") {
+-    source_set(
+-        "f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16_standalone") {
 -      cflags = [
--        "-mno-sse2",
--        "-msse",
+-        "-mavx512bf16",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512bf16-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -9855,18 +10767,196 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-conv-hwc2chw_x64") {
+-    source_set("f32-bf16-vcvt_x64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qs8-vcvt_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-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 = [
+-        "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-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-rminmax/f16-rmax-f16c-u32.c"
 +    ]
  
 -      sources = [
@@ -9909,14 +10999,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("f32-conv-hwc2chw_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_x64") {
++  source_set("f16-rminmax_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.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 = [
@@ -10024,14 +11116,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rminmax_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -10114,16 +11208,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("f32-dwconv2d-chw_x64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2") {
++  source_set("f16-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -10173,16 +11265,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -10326,15 +11416,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_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-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -10415,15 +11531,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_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-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -10548,22 +11690,34 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-vbinary_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-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-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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -10618,22 +11772,34 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vbinary_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-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-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 = [
@@ -10779,25 +11945,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vclamp_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-f16c-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -10882,25 +12039,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-vclamp_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-f16c-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -11016,16 +12164,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_f16c-no-avx2-no-fma") {
++  source_set("f16-vcos_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/f16-rmax-f16c-u32.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -11106,16 +12252,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      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") {
++  source_set("f16-vcos_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/f16-rmax-f16c-u32.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -11158,16 +12302,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("f32-f16-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_x64") {
++  source_set("f16-velu_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
 +    ]
  
 -      sources = [
@@ -11279,16 +12423,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-velu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -11298,13 +12442,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -11325,6 +12462,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
@@ -11339,14 +12483,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("f32-gemm_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_x64") {
++  source_set("f16-vexp_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -      sources = [
@@ -11469,14 +12613,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_x64_standalone") {
++  source_set("f16-vexp_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -11563,47 +12707,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("f32-gemm_x64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-vgelu_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-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" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -11626,15 +12738,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
@@ -11645,41 +12762,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-vgelu_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-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -11796,7 +12886,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_f16c-no-avx2-no-fma") {
++  source_set("f16-vhswish_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -11805,25 +12895,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11860,7 +12932,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vhswish_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -11869,25 +12941,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -11999,16 +13053,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vclamp_f16c-no-avx2-no-fma") {
++  source_set("f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-f16c-u16.c"
++      "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-3-3-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -12045,16 +13106,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vclamp_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-f16c-u16.c"
++      "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-3-3-div.c"
 +    ]
  
 -      sources = [
@@ -12171,14 +13239,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("f32-igemm_avx512f") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vcos_x64") {
++  source_set("f16-vlog_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -12224,14 +13292,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_x64_standalone") {
++  source_set("f16-vlog_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
 +    ]
  
 -      sources = [
@@ -12379,16 +13447,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-velu_f16c-fma-avx2") {
++  source_set("f16-vlrelu_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -12448,16 +13516,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-velu_f16c-fma-avx2_standalone") {
++  source_set("f16-vlrelu_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -12559,14 +13627,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vexp_x64") {
++  source_set("f16-vmulcaddc_f16c-fma-no-avx2") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -12624,14 +13694,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_x64_standalone") {
++  source_set("f16-vmulcaddc_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
 +    ]
  
 -      sources = [
@@ -12699,14 +13771,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_x64") {
++  source_set("f16-vrnd_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-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) {
@@ -12815,14 +13892,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_x64_standalone") {
++  source_set("f16-vrnd_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-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" ]
@@ -12943,7 +14025,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vhswish_f16c-no-avx2-no-fma") {
++  source_set("f16-vrsqrt_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -12952,7 +14034,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -13035,7 +14117,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vrsqrt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -13044,7 +14126,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -      sources = [
@@ -13114,16 +14196,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vlrelu_f16c-no-avx2-no-fma") {
++  source_set("f16-vsigmoid_f16c-fma-avx2") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -13232,16 +14314,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# 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-vsigmoid_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -13376,16 +14458,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vmulcaddc_f16c-fma-no-avx2") {
++  source_set("f16-vsin_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-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -13491,16 +14571,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vmulcaddc_f16c-fma-no-avx2_standalone") {
++  source_set("f16-vsin_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-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -13567,7 +14645,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vrnd_f16c-no-avx2-no-fma") {
++  source_set("f16-vsqrt_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -13576,10 +14654,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -13616,7 +14691,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vrnd_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vsqrt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -13625,10 +14700,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -      sources = [
@@ -13761,16 +14833,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vrsqrt_f16c-no-avx2-no-fma") {
++  source_set("f16-vsqrt_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -13855,16 +14925,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# 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-vsqrt_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -13985,16 +15053,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsigmoid_f16c-fma-avx2") {
++  source_set("f16-vtanh_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-vtanh/gen/f16-vtanh-avx512fp16-expm1minus-rr1-p3h2ts-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14075,16 +15150,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsigmoid_f16c-fma-avx2_standalone") {
++  source_set("f16-vtanh_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-vtanh/gen/f16-vtanh-avx512fp16-expm1minus-rr1-p3h2ts-div.c"
 +    ]
  
 -      sources = [
@@ -14154,14 +15236,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsin_x64") {
++  source_set("f16-vtanh_f16c-fma-no-avx2") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-fma3-polynomial-p19h9t2-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14267,14 +15351,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vtanh_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-fma3-polynomial-p19h9t2-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -14402,7 +15488,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_f16c-no-avx2-no-fma") {
++  source_set("f16-vtanh_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -14411,7 +15497,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-f16c-expm1minus-rr1-p3h2ts-rcp-u24.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14492,7 +15578,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vtanh_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -14501,7 +15587,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-f16c-expm1minus-rr1-p3h2ts-rcp-u24.c"
 +    ]
  
 -      sources = [
@@ -14545,16 +15631,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("f32-qu8-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_f16c-fma-no-avx2") {
++  source_set("f16-vtanh_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-fma3-polynomial-p19h9t2-u32.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
 +    ]
  
 -      sources = [
@@ -14602,16 +15686,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_f16c-fma-no-avx2_standalone") {
++  source_set("f16-vtanh_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-fma3-polynomial-p19h9t2-u32.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
 +    ]
  
 -      sources = [
@@ -14654,7 +15736,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("f32-raddstoreexpminusmax_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_f16c-no-avx2-no-fma") {
++  source_set("f16-vunary_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -14663,7 +15745,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vunary/gen/f16-vsqr-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -14767,7 +15849,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vunary_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -14776,7 +15858,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vunary/gen/f16-vsqr-f16c-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14891,16 +15973,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vunary_f16c-no-avx2-no-fma") {
++  source_set("f16-vunary_sse2-no-sse3") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
++      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
++    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -14958,16 +16040,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vunary_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vunary_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
++      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
++    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
 +    ]
  
 -      sources = [
@@ -15035,7 +16117,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vunary_sse2-no-sse3") {
++  source_set("f32-argmaxpool_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -15043,8 +16125,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
-+    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15131,7 +16212,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vunary_sse2-no-sse3_standalone") {
++  source_set("f32-argmaxpool_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -15139,8 +16220,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
-+    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
 +    ]
  
 -      sources = [
@@ -15210,15 +16290,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_sse2-no-sse3") {
++  source_set("f32-argmaxpool_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15301,15 +16380,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_sse2-no-sse3_standalone") {
++  source_set("f32-argmaxpool_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -      sources = [
@@ -15379,14 +16457,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_x64") {
++  source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15471,14 +16552,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_x64_standalone") {
++  source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
 +    ]
  
 -      sources = [
@@ -15546,17 +16630,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-avgpool_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15637,17 +16718,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-avgpool_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
 +    ]
  
 -      sources = [
@@ -15715,14 +16793,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_avx512f") {
++  source_set("f32-avgpool_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15807,14 +16886,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_avx512f_standalone") {
++  source_set("f32-avgpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
 +    ]
  
 -      sources = [
@@ -15882,15 +16962,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_sse2-no-sse3") {
++  source_set("f32-avgpool_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -15971,15 +17050,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_sse2-no-sse3_standalone") {
++  source_set("f32-avgpool_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -16047,14 +17125,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_x64") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512skx-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16143,14 +17227,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_x64_standalone") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512skx-u16.c"
 +    ]
  
 -      sources = [
@@ -16222,14 +17312,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_x64") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16") {
 +    cflags = [
-+  
++      "-mavx512bf16",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512bf16-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16314,14 +17413,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-bf16-vcvt_x64_standalone") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16_standalone") {
 +    cflags = [
-+  
++      "-mavx512bf16",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512bf16-u16.c"
 +    ]
  
 -      sources = [
@@ -16393,15 +17501,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_sse-no-sse2") {
++  source_set("f32-bf16-vcvt_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16486,15 +17593,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_sse-no-sse2_standalone") {
++  source_set("f32-bf16-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -16562,14 +17668,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_x64") {
++  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-scalar-1x1.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16650,14 +17757,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_x64_standalone") {
++  source_set("f32-conv-hwc2chw_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
 +    ]
  
 -      sources = [
@@ -16725,18 +17833,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_sse-no-sse2") {
++  source_set("f32-conv-hwc2chw_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-sse-2x4-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-sse-1x4-acc3.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-sse-4x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-sse-2x4.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16821,18 +17925,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_sse-no-sse2_standalone") {
++  source_set("f32-conv-hwc2chw_x64_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-sse-2x4-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-sse-1x4-acc3.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-sse-4x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-sse-2x4.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -      sources = [
@@ -16900,15 +18000,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1") {
++  source_set("f32-dwconv2d-chw_sse-no-sse2") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-sse-2x4-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-sse-1x4-acc3.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-sse-4x4.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-sse-2x4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16989,15 +18092,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv2d-chw_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-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 = [
@@ -17065,21 +18171,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_x64") {
++  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-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-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17160,21 +18260,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_x64_standalone") {
++  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
 +    ]
  
 -      sources = [
@@ -17246,20 +18340,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-dwconv2d-chw_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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-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) {
@@ -17344,20 +18439,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-dwconv2d-chw_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-avx.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx.c"
++      "src/src/f32-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 = [
@@ -17400,17 +18496,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("f32-vapproxgelu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_avx512f") {
++  source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-avx512f.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx512f.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx512f.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx512f.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-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 = [
@@ -17514,17 +18613,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_avx512f_standalone") {
++  source_set("f32-dwconv_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-dwconv/gen/f32-dwconv-25p16c-minmax-avx512f.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx512f.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx512f.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx512f.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-avx.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17614,19 +18716,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_f16c-fma-no-avx2") {
++  source_set("f32-dwconv_avx512f") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-fma3.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-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" ]
@@ -17663,19 +18763,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_f16c-fma-no-avx2_standalone") {
++  source_set("f32-dwconv_avx512f_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-fma3.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-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 = [
@@ -17821,7 +18919,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -17856,39 +18969,44 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vbinary_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("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",
@@ -17931,9 +19049,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-vbinary_sse-no-sse2") {
@@ -17973,29 +19093,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_sse-no-sse2_standalone") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-sse.c"
++    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) {
@@ -18042,14 +19150,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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 (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f32-vbinary_sse2-no-sse3") {
@@ -18076,14 +19181,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++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" ]
-+    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) {
@@ -18118,35 +19237,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+if (build_with_chromium) {
-+  source_set("f32-dwconv_x64") {
++    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") {
 +    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-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"
 +    ]
  
--  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",
@@ -18181,43 +19301,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vbinary_x64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_x64_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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -18259,12 +19362,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f32-vclamp_avx-no-avx2-no-f16c-no-fma") {
@@ -18291,17 +19393,33 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++if (build_with_chromium) {
++  source_set("f32-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"
 +    ]
  
 -      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) {
@@ -18335,59 +19453,74 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f32-vclamp_avx512f") {
 -      cflags = [ "-mavx512f" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-dwconv_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      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",
++    ]
+ 
 -      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" ]
+     }
    }
 +}
  
@@ -18395,21 +19528,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-avx512f.c",
@@ -18434,10 +19553,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-vclamp_sse2-no-sse3") {
@@ -18462,18 +19590,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vclamp_sse2-no-sse3_standalone") {
@@ -18504,32 +19635,68 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f32-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" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vclamp_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
@@ -18547,25 +19714,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "src/src/f32-f16-vcvt/gen/f32-f16-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("f32-vclamp_x64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vclamp/gen/f32-vclamp-scalar.c",
@@ -18589,6 +19737,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
@@ -23409,18 +24569,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c",
 -      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
 +if (build_with_chromium) {
 +  source_set("f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
@@ -23441,18 +24589,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-7x32-minmax-avx512skx-broadcast.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vsigmoid_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -23460,6 +24611,37 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("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") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-1x32-minmax-avx512skx-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-7x32-minmax-avx512skx-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x32-minmax-avx512skx-broadcast.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-7x32-minmax-avx512skx-broadcast.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c",
@@ -23483,9 +24665,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-vsigmoid_f16c-fma-avx2") {
@@ -23511,34 +24695,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-1x32-minmax-avx512skx-broadcast.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc4w-gemm-7x32-minmax-avx512skx-broadcast.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x32-minmax-avx512skx-broadcast.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-7x32-minmax-avx512skx-broadcast.c"
++    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) {
@@ -23571,14 +24738,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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 (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f32-vsigmoid_sse2-no-sse3") {
@@ -23603,14 +24767,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++if (build_with_chromium) {
++  source_set("f32-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"
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -23643,20 +24816,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_f16c-fma-no-avx2") {
-+    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-fma3-broadcast.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-fma3-broadcast.c"
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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_sse4.1-no-sse4.2") {
@@ -23682,20 +24856,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
++    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"
++    ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -23729,6 +24924,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -23738,17 +24958,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_f16c-fma-no-avx2_standalone") {
++  source_set("f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
 +    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-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 = [
@@ -23790,7 +25009,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-vsigmoid_x64_standalone") {
 -      cflags = []
--
++if (build_with_chromium) {
++  source_set("f32-qc8w-gemm_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c",
@@ -23814,19 +25044,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma") {
@@ -23853,20 +25085,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_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"
++    ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -23901,6 +25152,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++if (build_with_chromium) {
++  source_set("f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++    cflags = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -23910,16 +25187,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# 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-qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c"
 +    ]
  
 -      sources = [
@@ -23962,15 +25240,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("f32-vsin_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_x64") {
++  source_set("f32-qs8-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx2-u64.c"
 +    ]
  
 -      sources = [
@@ -24074,15 +25353,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qs8-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-avx2-u64.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -24115,14 +25395,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    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) {
@@ -24155,61 +25441,93 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    public_configs = [ ":xnnpack_public_config" ]
+-    }
++if (build_with_chromium) {
++  source_set("f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c"
++    ]
 +
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f32-vsin_x64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-qs8-vcvt_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/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c"
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/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" ]
+     }
    }
 +}
  
@@ -24217,19 +25535,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-vsin_x64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++if (build_with_chromium) {
++  source_set("f32-qs8-vcvt_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c"
 +    ]
  
 -      sources = [
@@ -24255,11 +25570,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsqrt_avx-no-avx2-no-f16c-no-fma") {
@@ -24287,17 +25612,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qs8-vcvt_sse2-no-sse3_standalone") {
++    cflags = [
++      "-mno-sse3",
++    "-msse2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -24332,58 +25679,83 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qs8-vcvt_sse4.1-no-sse4.2") {
++    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f32-vsqrt_avx512f") {
 -      cflags = [ "-mavx512f" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_f16c-fma-avx2") {
++# 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") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx2-u64.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c"
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/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" ]
+     }
    }
 +}
  
@@ -24391,18 +25763,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-vsqrt_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_f16c-fma-avx2_standalone") {
++if (build_with_chromium) {
++  source_set("f32-qs8-vcvt_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx2-u64.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 = [
@@ -24428,11 +25798,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsqrt_sse2-no-sse3") {
@@ -24458,17 +25838,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qs8-vcvt_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -24501,62 +25903,87 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++    cflags = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f32-vsqrt_x64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-qu8-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/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c"
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    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" ]
+     }
    }
 +}
  
@@ -24564,22 +25991,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-vsqrt_x64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++if (build_with_chromium) {
++  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-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
 +    ]
  
 -      sources = [
@@ -24605,11 +26027,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vtanh_avx-no-avx2-no-f16c-no-fma") {
@@ -24636,17 +26068,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qu8-vcvt_f16c-fma-avx2_standalone") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
 +    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) {
@@ -24680,103 +26135,138 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vtanh_avx512f") {
--      cflags = [ "-mavx512f" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c",
--      ]
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_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-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c"
 +    ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vtanh_avx512f_standalone") {
+-  if (build_with_chromium) {
+-    source_set("f32-vtanh_avx512f") {
 -      cflags = [ "-mavx512f" ]
 +# 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-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-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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: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" ]
--      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vtanh_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
++if (build_with_chromium) {
++  source_set("f32-qu8-vcvt_sse2-no-sse3") {
++    cflags = [
++      "-mno-sse3",
++    "-msse2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
@@ -24808,13 +26298,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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) {
@@ -24847,11 +26338,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qu8-vcvt_sse2-no-sse3_standalone") {
++    cflags = [
++      "-mno-sse3",
++    "-msse2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-vtanh_sse2-no-sse3") {
@@ -24877,25 +26377,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_sse4.1-no-sse4.2") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-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" ]
++
++    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) {
@@ -24929,6 +26430,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++if (build_with_chromium) {
++  source_set("f32-qu8-vcvt_x64") {
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -24945,15 +26463,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-qu8-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-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"
 +    ]
  
 -      sources = [
@@ -24996,15 +26514,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("f32-vtanh_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_x64") {
++  source_set("f32-raddstoreexpminusmax_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rr2-p5-u64-acc2.c"
 +    ]
  
 -      sources = [
@@ -25075,15 +26592,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-raddstoreexpminusmax_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-rr2-p5-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -25143,17 +26659,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-raddstoreexpminusmax_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -25177,17 +26692,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c"
 +    ]
  
 -      sources = [
@@ -25232,16 +26746,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("f32-vunary_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_f16c-fma-avx2") {
++  source_set("f32-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c"
 +    ]
  
 -      sources = [
@@ -25312,16 +26830,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -25379,20 +26901,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-raddstoreexpminusmax_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -25416,20 +26933,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-raddstoreexpminusmax_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c"
 +    ]
  
 -      sources = [
@@ -25474,15 +26986,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("f32-vunary_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_sse2-no-sse3") {
++  source_set("f32-raddstoreexpminusmax_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      sources = [
@@ -25531,15 +27042,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-raddstoreexpminusmax_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      sources = [
@@ -25677,15 +27187,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_x64") {
++  source_set("f32-rdminmax_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -25769,15 +27282,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# 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-rdminmax_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-avx-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -25899,14 +27415,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_avx512f") {
++  source_set("f32-rdminmax_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-u64-acc2.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx512f-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx512f-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -25930,14 +27447,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_avx512f_standalone") {
++  source_set("f32-rdminmax_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-u64-acc2.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx512f-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx512f-u32.c"
 +    ]
  
 -      sources = [
@@ -25980,16 +27498,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc2w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_f16c-fma-avx2") {
++  source_set("f32-rdminmax_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-sse2-u32.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-sse2-u32.c"
 +    ]
  
 -      sources = [
@@ -26099,16 +27617,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  }
 +# 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-rdminmax_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.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) {
@@ -26222,20 +27740,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-rdminmax_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-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" ]
@@ -26328,20 +27841,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdminmax_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-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" ]
@@ -26472,15 +27980,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -26592,15 +28102,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# 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-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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -26738,14 +28250,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_x64") {
++  source_set("f32-rdsum2_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -26872,14 +28384,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_x64_standalone") {
++  source_set("f32-rdsum2_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -27002,18 +28514,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_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-rdminmax/gen/f32-rdmax-2p2x-avx-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx-u32.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -27136,18 +28645,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum2_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -27292,15 +28798,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_avx512f") {
++  source_set("f32-rdsum2_x64") {
 +    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-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -27409,15 +28914,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_avx512f_standalone") {
++  source_set("f32-rdsum2_x64_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -27550,16 +29054,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_sse2-no-sse3") {
++  source_set("f32-rdsum_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-rdminmax/gen/f32-rdmax-2p2x-sse2-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-sse2-u32.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -27679,16 +29184,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum_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-rdminmax/gen/f32-rdmax-2p2x-sse2-u32.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-sse2-u32.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-u32.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -27805,15 +29311,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_x64") {
++  source_set("f32-rdsum_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -27837,15 +29342,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_x64_standalone") {
++  source_set("f32-rdsum_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f-u64.c"
 +    ]
  
 -      sources = [
@@ -27889,17 +29393,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qb4w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
 +    ]
  
 -      sources = [
@@ -28010,17 +29512,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum_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-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -28103,14 +29603,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_avx512f") {
++  source_set("f32-rdsum_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx512f.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -28134,14 +29634,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_avx512f_standalone") {
++  source_set("f32-rdsum_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx512f.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -28184,15 +29684,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc2w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.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"
 +    ]
  
 -      sources = [
@@ -28302,15 +29806,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.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) {
@@ -28426,14 +29934,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_x64") {
++  source_set("f32-rminmax_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -28528,14 +30038,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rminmax_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -28676,17 +30188,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_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-rdsum/gen/f32-rdsum-7p7x-minmax-avx-u32.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) {
@@ -28810,17 +30322,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rminmax_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-u32.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -28937,14 +30449,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_avx512f") {
++  source_set("f32-rminmax_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-u64.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" ]
@@ -28968,14 +30482,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rminmax_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-u64.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 = [
@@ -29019,15 +30535,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc4w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_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-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-avx-u8.c"
 +    ]
  
 -      sources = [
@@ -29138,15 +30656,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-avx-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -29262,14 +30782,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_x64") {
++  source_set("f32-rsum2_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-avx512f-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -29364,14 +30884,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_x64_standalone") {
++  source_set("f32-rsum2_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-avx512f-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -29516,19 +31036,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-rsum2_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-rsum2/gen/f32-rsum2-sse2-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -29632,27 +31148,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum2_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-rsum2/gen/f32-rsum2-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" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -29661,7 +31172,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -29701,16 +31213,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_avx512f") {
++  source_set("f32-rsum2_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-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -29734,16 +31244,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_avx512f_standalone") {
++  source_set("f32-rsum2_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-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -29788,17 +31296,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_sse-no-sse2") {
++  source_set("f32-rsum_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-rsum/gen/f32-rsum-avx-u32-acc4.c"
 +    ]
  
 -      sources = [
@@ -29910,17 +31418,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_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-rsum/gen/f32-rsum-avx-u32-acc4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -30036,16 +31544,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_x64") {
++  source_set("f32-rsum_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-rsum/gen/f32-rsum-avx512f-u32-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -30140,16 +31646,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_x64_standalone") {
++  source_set("f32-rsum_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-rsum/gen/f32-rsum-avx512f-u32-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -30294,17 +31798,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-rsum_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-rsum/gen/f32-rsum-sse2-u16-acc4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -30408,25 +31910,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_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-rsum/gen/f32-rsum-sse2-u16-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" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -30435,7 +31934,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -30475,14 +31975,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_avx512f") {
++  source_set("f32-rsum_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-avx512f-u16.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -30506,14 +32006,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_avx512f_standalone") {
++  source_set("f32-rsum_x64_standalone") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-avx512f-u16.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
@@ -30558,15 +32058,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-igemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_sse2-no-sse3") {
++  source_set("f32-spmm_sse-no-sse2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-sse2-u4.c"
++      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-sse.c"
 +    ]
  
 -      sources = [
@@ -30676,15 +32176,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-spmm_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-sse2-u4.c"
++      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-sse.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -30798,14 +32298,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_x64") {
++  source_set("f32-spmm_x64") {
 +    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" ]
@@ -30891,14 +32393,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_x64_standalone") {
++  source_set("f32-spmm_x64_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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -31016,7 +32520,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rsum_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -31026,7 +32530,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-avx-u32-acc4.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-rational-12-10-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -31075,7 +32579,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-vapproxgelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -31085,7 +32589,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-avx-u32-acc4.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -31219,14 +32723,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum_avx512f") {
++  source_set("f32-vapproxgelu_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-acc2.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -31307,14 +32811,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vapproxgelu_avx512f_standalone") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-acc2.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -31442,15 +32946,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rsum_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-rsum/gen/f32-rsum-sse2-u16-acc4.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-fma3-rational-12-10-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -31551,15 +33056,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vapproxgelu_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-sse2-u16-acc4.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-fma3-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31615,14 +33121,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-rsum_x64") {
++  source_set("f32-vapproxgelu_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31646,14 +33154,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vapproxgelu_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.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"
 +    ]
  
 -      sources = [
@@ -31696,15 +33206,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-f32-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-spmm_sse-no-sse2") {
++  source_set("f32-vapproxgelu_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-sse.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -31814,15 +33323,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vapproxgelu_x64_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-sse.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -31936,16 +33444,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-spmm_x64") {
++  source_set("f32-vbinary_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -32012,16 +33539,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_x64_standalone") {
++  source_set("f32-vbinary_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-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 = [
@@ -32123,17 +33669,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vbinary_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-rational-12-10-div.c"
++      "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" ]
@@ -32217,17 +33778,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# 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-vbinary_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-rational-12-10-div.c"
++      "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" ]
@@ -32358,14 +33934,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_avx512f") {
++  source_set("f32-vbinary_sse-no-sse2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-div.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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -32414,14 +34006,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_avx512f_standalone") {
++  source_set("f32-vbinary_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-div.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"
 +    ]
  
 -      sources = [
@@ -32561,16 +34169,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_f16c-fma-no-avx2") {
++  source_set("f32-vbinary_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-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -32654,16 +34263,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vbinary_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-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -32796,34 +34406,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_sse2-no-sse3") {
++  source_set("f32-vbinary_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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-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" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -32856,40 +34467,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vapproxgelu_sse2-no-sse3_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"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -32930,29 +34521,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -32983,14 +34551,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vbinary_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33047,7 +34633,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vclamp_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -33057,25 +34643,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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-vclamp/gen/f32-vclamp-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33099,7 +34667,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vclamp_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -33109,25 +34677,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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-vclamp/gen/f32-vclamp-avx.c"
 +    ]
  
 -      sources = [
@@ -33171,32 +34721,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-qc4w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_avx512f") {
++  source_set("f32-vclamp_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"
++      "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c"
 +    ]
  
 -      sources = [
@@ -33223,21 +34755,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") {
@@ -33266,54 +34788,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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" ]
-     }
    }
 +}
  
@@ -33352,48 +34836,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vbinary_sse-no-sse2") {
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vclamp_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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-vclamp/gen/f32-vclamp-avx512f.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc8w-dwconv_f16c-fma-avx2") {
@@ -33421,54 +34875,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vbinary_sse-no-sse2_standalone") {
-+    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"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -33503,34 +34923,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-vbinary_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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" ]
+     }
    }
 +}
  
@@ -33565,9 +34962,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vbinary_sse2-no-sse3_standalone") {
++if (build_with_chromium) {
++  source_set("f32-vclamp_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -33575,32 +34971,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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-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: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(
@@ -33640,40 +35021,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vbinary_x64") {
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -33712,54 +35059,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vclamp_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-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" ]
-+
-+    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) {
@@ -33794,35 +35111,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vclamp_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-avx.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2") {
@@ -33849,36 +35144,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vclamp_avx-no-avx2-no-f16c-no-fma_standalone") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-avx.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    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" ]
      }
@@ -33918,48 +35186,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_avx512f") {
++  source_set("f32-vclamp_x64") {
 +    cflags = [
-+      "-mavx512f"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc8w-dwconv_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_avx512f_standalone") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -33990,15 +35231,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
@@ -34006,16 +35244,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-qc8w-dwconv_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-vclamp_sse2-no-sse3") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vclamp_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-sse2.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      sources = [
@@ -34046,21 +35284,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
@@ -34088,24 +35316,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vclamp_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-sse2.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -34114,13 +35324,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -34155,31 +35361,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-vclamp_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -34210,38 +35394,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vclamp_x64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-vcmul_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-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" ]
-+
-+    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) {
@@ -34278,22 +35448,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vcmul_avx512f") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-avx512f-u32.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -34343,27 +35497,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcmul/gen/f32-vcmul-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" ]
-+
-+    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) {
@@ -34400,34 +35541,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vcmul_f16c-fma-no-avx2") {
-+    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-fma3-u16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc8w-gemm_f16c-fma-avx2") {
@@ -34454,35 +35574,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcmul_f16c-fma-no-avx2_standalone") {
-+    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-fma3-u16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -34522,33 +35616,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_sse-no-sse2") {
++  source_set("f32-vcmul_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "src/src/f32-vcmul/gen/f32-vcmul-fma3-u16.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -34582,40 +35662,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcmul_sse-no-sse2_standalone") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.c"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      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) {
 -    source_set(
@@ -34656,29 +35717,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vcmul_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -34716,36 +35754,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_x64_standalone") {
++  source_set("f32-vcmul_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-fma3-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: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) {
@@ -34786,37 +35813,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    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(
@@ -34852,38 +35855,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcopysign_avx-no-avx2-no-f16c-no-fma_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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    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" ]
      }
@@ -34932,34 +35906,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_avx512f") {
++  source_set("f32-vcmul_sse-no-sse2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-vcmul/gen/f32-vcmul-sse-u8.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc8w-gemm_sse2-no-sse3") {
@@ -34985,41 +35943,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcopysign_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"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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) {
 -    source_set("qs8-qc8w-gemm_sse2-no-sse3_standalone") {
@@ -35052,32 +35990,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vcopysign_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -35108,32 +36020,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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-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" ]
-+
+ 
+-      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)) {
@@ -35175,16 +36085,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_x64") {
++  source_set("f32-vcmul_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35208,16 +36116,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -35261,7 +36167,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-gemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -35271,7 +36177,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-avx-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 = [
@@ -35298,21 +36206,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma") {
@@ -35340,39 +36238,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcos_avx-no-avx2-no-f16c-no-fma_standalone") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-avx-rational-5-4-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
    }
 +}
  
@@ -35410,32 +36285,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vcos_avx512f") {
+-  }
++# 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") {
 +    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-vcopysign/gen/f32-vcopysign-avx.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
@@ -35464,23 +36330,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcos_avx512f_standalone") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -35488,15 +36345,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
@@ -35531,33 +36379,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-vcos_f16c-fma-no-avx2") {
-+    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -35588,40 +36414,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcos_f16c-fma-no-avx2_standalone") {
++if (build_with_chromium) {
++  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"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    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) {
@@ -35658,24 +36470,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vcos_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -35714,38 +36508,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# 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_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    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-avx512f.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx512f.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -35780,32 +36561,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vcos_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -35839,33 +36601,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcos_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -35912,35 +36650,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-velu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vcopysign_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-u32.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "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" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -35973,42 +36696,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-velu_avx-no-avx2-no-f16c-no-fma_standalone") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-u32.c"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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) {
 -    source_set(
@@ -36048,29 +36750,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-velu_avx512f") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -36111,36 +36790,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_avx512f_standalone") {
++  source_set("f32-vcopysign_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -36184,34 +36853,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-velu_f16c-fma-avx2") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc8w-igemm_sse2-no-sse3") {
@@ -36237,35 +36885,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-velu_f16c-fma-avx2_standalone") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    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" ]
      }
@@ -36304,33 +36926,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-velu_sse2-no-sse3") {
++  source_set("f32-vcopysign_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-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" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2") {
@@ -36356,40 +36964,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-velu_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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) {
 -    source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
@@ -36422,29 +37011,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-velu_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -36454,14 +37020,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcopysign_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
 +    ]
  
 -      sources = [
@@ -36505,7 +37073,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-igemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vexp_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -36515,7 +37083,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-avx-rational-3-2-div.c"
++      "src/src/f32-vcos/gen/f32-vcos-avx-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -36542,21 +37110,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni") {
@@ -36584,39 +37142,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vexp_avx-no-avx2-no-f16c-no-fma_standalone") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-avx-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",
++      "//third_party/pthreadpool",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
    }
 +}
  
@@ -36654,32 +37189,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vexp_avx512f") {
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-avx512f-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",
++      "src/src/f32-vcos/gen/f32-vcos-avx-rational-5-4-div.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -36711,18 +37235,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vexp_avx512f_standalone") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-avx512f-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" ]
@@ -36734,10 +37246,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
      }
@@ -36783,16 +37295,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vexp_f16c-fma-no-avx2") {
++  source_set("f32-vcos_avx512f") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
++      "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36816,16 +37326,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcos_avx512f_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
++      "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -36868,16 +37376,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-qu8-packw_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vexp_sse2-no-sse3") {
++  source_set("f32-vcos_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-sse2-rational-3-2-div.c",
-+    "src/src/f32-vexp/gen/f32-vexp-sse2fma-rational-3-2-div.c"
++      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -36903,21 +37411,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-rdsum_f16c-fma-avx2") {
@@ -36943,38 +37441,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vexp_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
    }
 +}
  
@@ -37010,32 +37486,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vexp_x64") {
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vcos_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-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",
++      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -37066,23 +37530,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vexp_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-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" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -37090,15 +37545,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set(
@@ -37135,34 +37581,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    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" ]
+     }
    }
 +}
  
@@ -37189,41 +37612,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vgelu_avx-no-avx2-no-f16c-no-fma_standalone") {
++if (build_with_chromium) {
++  source_set("f32-vcos_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c"
++      "src/src/f32-vcos/gen/f32-vcos-sse2-rational-5-4-div.c",
++    "src/src/f32-vcos/gen/f32-vcos-sse2fma-rational-5-4-div.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    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) {
@@ -37256,22 +37664,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vgelu_avx512f") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -37288,14 +37680,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_avx512f_standalone") {
++  source_set("f32-vcos_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
++      "src/src/f32-vcos/gen/f32-vcos-sse2-rational-5-4-div.c",
++    "src/src/f32-vcos/gen/f32-vcos-sse2fma-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -37338,16 +37732,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-rdsum_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_f16c-fma-no-avx2") {
++  source_set("f32-vcos_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -37373,21 +37765,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-rsum_avx2-avxvnni-f16c-fma-gfni") {
@@ -37415,38 +37797,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vgelu_f16c-fma-no-avx2_standalone") {
-+    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    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" ]
-     }
    }
 +}
  
@@ -37484,34 +37844,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vgelu_sse2-no-sse3") {
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vcos_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-sse2-rational-12-10-div.c",
-+    "src/src/f32-vgelu/gen/f32-vgelu-sse2fma-rational-12-10-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-rsum_f16c-fma-avx2") {
@@ -37537,25 +37881,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vgelu_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-sse2-rational-12-10-div.c",
-+    "src/src/f32-vgelu/gen/f32-vgelu-sse2fma-rational-12-10-div.c"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -37563,15 +37896,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-rsum_f16c-fma-avx2_standalone") {
@@ -37603,31 +37927,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-vgelu_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    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" ]
+     }
    }
 +}
  
@@ -37661,38 +37965,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vgelu_x64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-velu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-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" ]
-+
-+    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) {
@@ -37732,25 +38025,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-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",
@@ -37794,7 +38068,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# 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-velu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -37804,29 +38078,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
++      "src/src/f32-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-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" ]
-+
-+    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) {
@@ -37866,32 +38127,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vhswish_avx512f") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-rsum_ssse3-no-sse4.1") {
@@ -37916,33 +38158,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vhswish_avx512f_standalone") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -37981,16 +38199,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_f16c-fma-no-avx2") {
++  source_set("f32-velu_avx512f") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-fma3.c"
++      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38014,16 +38230,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-velu_avx512f_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-fma3.c"
++      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
 +    ]
  
 -      sources = [
@@ -38066,16 +38280,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-rsum_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_sse2-no-sse3") {
++  source_set("f32-velu_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
 +    ]
  
 -      sources = [
@@ -38101,21 +38315,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vadd_avx-no-avx2-no-f16c-no-fma") {
@@ -38142,38 +38346,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vhswish_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-sse2.c",
-+    "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
    }
 +}
  
@@ -38210,32 +38392,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vhswish_x64") {
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-velu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-vadd_f16c-fma-avx2") {
@@ -38261,23 +38431,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vhswish_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-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",
@@ -38285,15 +38446,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-vadd_f16c-fma-avx2_standalone") {
@@ -38325,31 +38477,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-vlog_avx512f") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -38382,38 +38514,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlog_avx512f_standalone") {
++if (build_with_chromium) {
++  source_set("f32-velu_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
++      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    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) {
@@ -38452,24 +38571,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vlog_f16c-fma-avx2") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -38506,38 +38607,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# 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-velu_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
++      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    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) {
@@ -38570,34 +38657,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vlog_f16c-fma-no-avx2") {
-+    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-vadd_sse4.1-no-sse4.2") {
@@ -38622,35 +38688,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlog_f16c-fma-no-avx2_standalone") {
-+    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -38689,16 +38729,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vlog_sse2-no-sse3") {
++  source_set("f32-velu_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-sse2-rational-3-3-div.c",
-+    "src/src/f32-vlog/gen/f32-vlog-sse2fma-rational-3-3-div.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -38722,16 +38760,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-velu_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-sse2-rational-3-3-div.c",
-+    "src/src/f32-vlog/gen/f32-vlog-sse2fma-rational-3-3-div.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      sources = [
@@ -38775,14 +38811,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-vadd_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vlog_x64") {
++  source_set("f32-vexp_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vexp/gen/f32-vexp-avx-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -38809,21 +38848,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vaddc_avx-no-avx2-no-f16c-no-fma") {
@@ -38850,36 +38879,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlog_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
    }
 +}
  
@@ -38916,8 +38925,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vlrelu_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-vexp_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -38927,24 +38938,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-avx-u16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "src/src/f32-vexp/gen/f32-vexp-avx-rational-3-2-div.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-vaddc_f16c-fma-avx2") {
@@ -38970,26 +38965,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_avx-no-avx2-no-f16c-no-fma_standalone") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-avx-u16.c"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -38997,15 +38980,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-vaddc_f16c-fma-avx2_standalone") {
@@ -39037,31 +39011,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        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",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -39094,38 +39048,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
++if (build_with_chromium) {
++  source_set("f32-vexp_avx512f") {
 +    cflags = [
 +      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-avx512f-u16.c"
++      "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -39164,23 +39104,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vlrelu_sse-no-sse2") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-sse-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -39217,37 +39140,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_sse-no-sse2_standalone") {
++  source_set("f32-vexp_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-sse-u8.c"
++      "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -39280,33 +39189,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vlrelu_sse4.1-no-sse4.2") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-vaddc_sse4.1-no-sse4.2") {
@@ -39331,34 +39220,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -39397,14 +39261,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_x64") {
++  source_set("f32-vexp_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-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -39428,14 +39294,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_x64_standalone") {
++  source_set("f32-vexp_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vexp/gen/f32-vexp-fma3-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -39479,15 +39347,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-vaddc_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_sse-no-sse2") {
++  source_set("f32-vexp_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.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 = [
@@ -39514,21 +39383,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
@@ -39555,37 +39414,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_sse-no-sse2_standalone") {
-+    cflags = [
-+      "-mno-sse2",
-+    "-msse"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
    }
 +}
  
@@ -39622,32 +39460,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_x64") {
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vexp_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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",
++      "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"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-vcvt_f16c-fma-avx2") {
@@ -39673,23 +39499,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -39697,15 +39514,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-vcvt_f16c-fma-avx2_standalone") {
@@ -39737,37 +39545,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-vrnd_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-avx-u16.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-avx-u16.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-avx-u16.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-avx-u16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -39794,44 +39576,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
++if (build_with_chromium) {
++  source_set("f32-vexp_x64") {
 +    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"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -39864,25 +39626,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -39919,39 +39662,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_avx512f_standalone") {
++  source_set("f32-vexp_x64_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"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -39984,36 +39711,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vrnd_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-sse2-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-sse2-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-sse2-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-sse2-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-vcvt_ssse3-no-sse4.1") {
@@ -40038,37 +39742,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-sse2-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-sse2-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-sse2-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-sse2-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -40107,18 +39783,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_sse4.1-no-sse4.2") {
++  source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-sse41-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-sse41-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-sse41-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-sse41-u8.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -40142,18 +39817,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_sse4.1-no-sse4.2_standalone") {
++  source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-sse41-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-sse41-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-sse41-u8.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-sse41-u8.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -40196,17 +39870,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_x64") {
++  source_set("f32-vgelu_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -40232,21 +39903,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
@@ -40273,39 +39934,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_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" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
    }
 +}
  
@@ -40342,36 +39980,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+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-vgelu_avx512f_standalone") {
 +    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-vgelu/gen/f32-vgelu-avx512f-rational-12-10-div.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-vlrelu_f16c-fma-avx2") {
@@ -40397,27 +40017,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vrsqrt_avx-no-avx2-no-f16c-no-fma_standalone") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-rsqrt.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.c"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -40425,15 +40032,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-vlrelu_f16c-fma-avx2_standalone") {
@@ -40465,32 +40063,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-vrsqrt_avx512f") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-rsqrt.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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" ]
+     }
    }
 +}
  
@@ -40517,39 +40094,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vrsqrt_avx512f_standalone") {
++if (build_with_chromium) {
++  source_set("f32-vgelu_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -40582,24 +40146,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vrsqrt_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-rsqrt.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-sqrt.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -40636,38 +40182,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vgelu_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    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-vgelu/gen/f32-vgelu-fma3-rational-12-10-div.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -40700,33 +40233,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vrsqrt_x64") {
-+    cflags = [
-+  
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-vlrelu_ssse3-no-sse4.1") {
@@ -40751,34 +40264,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vrsqrt_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -40817,17 +40305,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vgelu_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.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" ]
@@ -40851,17 +40338,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-vgelu_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.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 = [
@@ -40904,14 +40390,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-vlrelu_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_avx512f") {
++  source_set("f32-vgelu_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-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -40937,21 +40423,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vmul_avx-no-avx2-no-f16c-no-fma") {
@@ -40978,36 +40454,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsigmoid_avx512f_standalone") {
-+    cflags = [
-+      "-mavx512f"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
    }
 +}
  
@@ -41044,34 +40500,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vsigmoid_f16c-fma-avx2") {
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vgelu_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-vmul_sse2-no-sse3") {
@@ -41096,25 +40536,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsigmoid_f16c-fma-avx2_standalone") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
-+    ]
-+
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -41122,15 +40551,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-vmul_sse2-no-sse3_standalone") {
@@ -41161,32 +40581,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+if (build_with_chromium) {
-+  source_set("f32-vsigmoid_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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" ]
+     }
    }
 +}
  
@@ -41213,39 +40612,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsigmoid_sse2-no-sse3_standalone") {
++if (build_with_chromium) {
++  source_set("f32-vhswish_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-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
-+    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) {
@@ -41278,24 +40665,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("f32-vsigmoid_sse4.1-no-sse4.2") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-lut64-p2-div-u8.c",
-+    "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-p5-div-u8.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -41312,16 +40681,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-vhswish_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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-vhswish/gen/f32-vhswish-avx.c"
 +    ]
  
 -      sources = [
@@ -41364,14 +40734,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-vmul_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_x64") {
++  source_set("f32-vhswish_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
 +    ]
  
 -      sources = [
@@ -41473,30 +40843,88 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsigmoid_x64_standalone") {
++  source_set("f32-vhswish_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vmulc_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vmulc_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -41504,26 +40932,82 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
      }
    }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vmulc_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vhswish_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-fma3.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vmulc_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -41532,55 +41016,101 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vmulc_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-vhswish_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-fma3.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vmulc_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsin_avx512f") {
++  source_set("f32-vhswish_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-sse2.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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" ]
@@ -41594,19 +41124,45 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vprelu_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_avx512f_standalone") {
++  source_set("f32-vhswish_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-sse2.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41622,24 +41178,55 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vprelu_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vsin_f16c-fma-no-avx2") {
++  source_set("f32-vhswish_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41655,56 +41242,97 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vprelu_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_f16c-fma-no-avx2_standalone") {
++  source_set("f32-vhswish_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vprelu_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsin_sse2-no-sse3") {
++  source_set("f32-vlog_avx512f") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    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-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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" ]
@@ -41718,28 +41346,51 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vpreluc_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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-vlog_avx512f_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512f"
 +    ]
 +  
 +    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-vlog/gen/f32-vlog-avx512f-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -41751,19 +41402,53 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vpreluc_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vsin_x64") {
++  source_set("f32-vlog_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41779,56 +41464,101 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vpreluc_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_x64_standalone") {
++  source_set("f32-vlog_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vpreluc_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vlog_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-avx-rsqrt.c",
-+    "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.c"
++      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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" ]
@@ -41842,23 +41572,45 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vrpreluc_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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-vlog_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-avx-rsqrt.c",
-+    "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.c"
++      "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41874,22 +41626,57 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vrpreluc_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_avx512f") {
++  source_set("f32-vlog_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c"
++      "src/src/f32-vlog/gen/f32-vlog-sse2-rational-3-3-div.c",
++    "src/src/f32-vlog/gen/f32-vlog-sse2fma-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -41905,120 +41692,361 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vrpreluc_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_avx512f_standalone") {
++  source_set("f32-vlog_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c"
++      "src/src/f32-vlog/gen/f32-vlog-sse2-rational-3-3-div.c",
++    "src/src/f32-vlog/gen/f32-vlog-sse2fma-rational-3-3-div.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vrpreluc_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_sse2-no-sse3") {
++  source_set("f32-vlog_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c",
-+    "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx-mul16.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx-mul16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx-mul16.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx-mul16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_sse2-no-sse3_standalone") {
++  source_set("f32-vlog_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c",
-+    "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-dwconv_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx2-mul32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-dwconv_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx2-mul32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_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-vsqrt/gen/f32-vsqrt-scalar-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" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -42027,19 +42055,46 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-dwconv_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse2-mul16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_x64_standalone") {
++  source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-avx-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42053,27 +42108,57 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
-+if (build_with_chromium) {
-+  source_set("f32-vtanh_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-dwconv_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse2-mul16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++if (build_with_chromium) {
++  source_set("f32-vlrelu_avx512f") {
++    cflags = [
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-avx512f-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42089,22 +42174,43 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-dwconv_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse41-mul16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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-vlrelu_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-avx512f-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42118,24 +42224,58 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-dwconv_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse41-mul16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_avx512f") {
++  source_set("f32-vlrelu_sse-no-sse2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-sse-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42151,19 +42291,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    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-vtanh_avx512f_standalone") {
++  source_set("f32-vlrelu_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-sse-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42177,28 +42321,77 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-dwconv_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_f16c-fma-no-avx2") {
++  source_set("f32-vlrelu_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-u8.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -42212,21 +42405,45 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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-vlrelu_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42242,24 +42459,56 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_sse2-no-sse3") {
++  source_set("f32-vlrelu_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-sse2-rational-9-8-div.c",
-+    "src/src/f32-vtanh/gen/f32-vtanh-sse2fma-rational-9-8-div.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42275,28 +42524,51 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-f32-vcvt_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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-vlrelu_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-sse2-rational-9-8-div.c",
-+    "src/src/f32-vtanh/gen/f32-vtanh-sse2fma-rational-9-8-div.c"
++      "src/src/f32-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" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -42308,19 +42580,52 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-f32-vcvt_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_x64") {
++  source_set("f32-vmulcaddc_sse-no-sse2") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42336,19 +42641,49 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_x64_standalone") {
++  source_set("f32-vmulcaddc_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42364,27 +42699,60 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "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("f32-vunary_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vmulcaddc_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-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42400,31 +42768,50 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-f32-vcvt_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# 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-vmulcaddc_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-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" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -42436,21 +42823,56 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-f32-vcvt_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vunary_avx512f") {
++  source_set("f32-vrnd_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-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" ]
@@ -42466,21 +42888,48 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-f32-vcvt_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_avx512f_standalone") {
++  source_set("f32-vrnd_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-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" ]
@@ -42496,25 +42945,57 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-f32-vcvt_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
-+  source_set("f32-vunary_sse2-no-sse3") {
++  source_set("f32-vrnd_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-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" ]
@@ -42530,85 +43011,196 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-f32-vcvt_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_sse2-no-sse3_standalone") {
++  source_set("f32-vrnd_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-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"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-f32-vcvt_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vunary_x64") {
++  source_set("f32-vrnd_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-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"
 +    ]
-+
+ 
+-      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" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-2x4c8-minmax-fp32-avx-ld128.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-2x4c8-minmax-fp32-avx-ld128.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_x64_standalone") {
++  source_set("f32-vrnd_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-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" ]
@@ -42627,43 +43219,52 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x8c8-minmax-fp32-avx2.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x8c8-minmax-fp32-avx2.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +if (build_with_chromium) {
-+  source_set("operators_x64") {
++  source_set("f32-vrnd_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -42677,41 +43278,55 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-gemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x8c8-minmax-fp32-avx2.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x8c8-minmax-fp32-avx2.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("operators_x64_standalone") {
++  source_set("f32-vrnd_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-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" ]
@@ -42730,26 +43345,58 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-7x16c8-minmax-fp32-avx512skx-prfm.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2") {
++  source_set("f32-vrnd_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x8c8-minmax-avx2.c",
-+    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-3x8c8-minmax-avx2.c"
++      "src/src/f32-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" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
 +
@@ -42761,22 +43408,59 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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(
+-        "qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-7x16c8-minmax-fp32-avx512skx-prfm.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +# 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-vrnd_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x8c8-minmax-avx2.c",
-+    "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-3x8c8-minmax-avx2.c"
++      "src/src/f32-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" ]
@@ -42795,26 +43479,51 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-gemm_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse2-ld64.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avxvnni.c",
-+    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-5x8c8-minmax-avxvnni.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -42828,24 +43537,54 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-gemm_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse2-ld64.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +# 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-vrsqrt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avxvnni.c",
-+    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-5x8c8-minmax-avxvnni.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42864,24 +43603,48 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-gemm_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse41-ld64.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_f16c-fma-avx2") {
++  source_set("f32-vrsqrt_avx512f") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
-+    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-8x8c8-minmax-avx2-madd.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -42895,22 +43658,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc2w-gemm_f16c-fma-avx2_standalone") {
++  source_set("f32-vrsqrt_avx512f_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
-+    "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-8x8c8-minmax-avx2-madd.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42934,14 +43695,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_x64") {
++  source_set("f32-vrsqrt_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-vrsqrt/gen/f32-vrsqrt-sse2-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42962,14 +43725,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vrsqrt_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-vrsqrt/gen/f32-vrsqrt-sse2-rsqrt.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -42993,19 +43758,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vrsqrt_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-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43026,19 +43787,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vrsqrt_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-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43062,17 +43819,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx2") {
++  source_set("f32-vsigmoid_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-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43093,17 +43850,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsigmoid_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-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43127,21 +43884,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-vsigmoid_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-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43162,21 +43912,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsigmoid_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-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43200,22 +43943,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("f32-vsigmoid_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256vnni.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256vnni.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43236,22 +43973,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsigmoid_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256vnni.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256vnni.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43275,19 +44006,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vsigmoid_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43308,19 +44035,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsigmoid_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43344,17 +44067,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx2") {
++  source_set("f32-vsigmoid_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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/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" ]
@@ -43375,17 +44097,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsigmoid_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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/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" ]
@@ -43409,21 +44130,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-vsigmoid_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256skx.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-avx256skx.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43444,21 +44158,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsigmoid_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256skx.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-avx256skx.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43482,22 +44189,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("f32-vsin_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/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/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43518,22 +44220,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsin_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/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/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43557,25 +44254,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsin_avx512f") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx512f"
 +    ]
 +  
 +    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/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43596,25 +44282,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsin_avx512f_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx512f"
 +    ]
 +  
 +    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/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43638,19 +44313,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vsin_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
++      "-mf16c",
 +    "-mfma",
-+    "-mgfni"
++    "-mno-avx2"
 +    ]
 +  
 +    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/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43671,19 +44343,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsin_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
++      "-mf16c",
 +    "-mfma",
-+    "-mgfni"
++    "-mno-avx2"
 +    ]
 +  
 +    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/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43707,17 +44376,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2") {
++  source_set("f32-vsin_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -43738,17 +44406,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsin_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -43772,21 +44439,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-vsin_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256skx.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-avx256skx.c"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43807,21 +44467,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsin_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256skx.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-avx256skx.c"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43845,22 +44498,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("f32-vsqrt_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/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/f32-vsqrt/gen/f32-vsqrt-avx-rsqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43881,22 +44530,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsqrt_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/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/f32-vsqrt/gen/f32-vsqrt-avx-rsqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43920,25 +44565,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsqrt_avx512f") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx512f"
 +    ]
 +  
 +    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/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -43959,25 +44593,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsqrt_avx512f_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx512f"
 +    ]
 +  
 +    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/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44001,18 +44624,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-vsqrt_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44033,18 +44654,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsqrt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c",
++    "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44068,17 +44687,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx2") {
++  source_set("f32-vsqrt_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x8c8-minmax-avx2.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x8c8-minmax-avx2.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44099,17 +44715,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsqrt_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x8c8-minmax-avx2.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x8c8-minmax-avx2.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44133,22 +44746,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("f32-vtanh_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/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/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44169,22 +44777,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vtanh_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/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/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44208,23 +44811,75 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
++  source_set("f32-vtanh_avx512f") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
++      "-mavx512f"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vtanh_avx512f_standalone") {
++    cflags = [
++      "-mavx512f"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f32-vtanh_f16c-fma-no-avx2") {
++    cflags = [
++      "-mf16c",
 +    "-mfma",
-+    "-mgfni"
++    "-mno-avx2"
 +    ]
 +  
 +    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/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44245,23 +44900,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vtanh_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
++      "-mf16c",
 +    "-mfma",
-+    "-mgfni"
++    "-mno-avx2"
 +    ]
 +  
 +    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/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44285,7 +44933,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_sse2-no-sse3") {
++  source_set("f32-vtanh_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -44293,8 +44941,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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/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" ]
@@ -44315,7 +44963,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_sse2-no-sse3_standalone") {
++  source_set("f32-vtanh_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -44323,8 +44971,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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/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" ]
@@ -44348,16 +44996,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2") {
++  source_set("f32-vtanh_x64") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse41-ld128.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x4c8-minmax-sse41-ld128.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44378,16 +45024,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vtanh_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse41-ld128.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x4c8-minmax-sse41-ld128.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44411,15 +45055,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_x64") {
++  source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-vunary/gen/f32-vabs-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" ]
@@ -44440,15 +45088,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vunary_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-vunary/gen/f32-vabs-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" ]
@@ -44472,19 +45124,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("f32-vunary_avx512f") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx512f"
 +    ]
 +  
 +    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/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" ]
@@ -44505,19 +45154,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vunary_avx512f_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mavx512f"
 +    ]
 +  
 +    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/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" ]
@@ -44541,17 +45187,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2") {
++  source_set("f32-vunary_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -44572,17 +45218,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vunary_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -44606,14 +45252,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_x64") {
++  source_set("f32-vunary_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
++    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
++    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44634,14 +45282,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vunary_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
++    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
++    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44665,19 +45315,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("operators_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c"
++      "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" ]
@@ -44698,19 +45365,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("operators_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c"
++      "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" ]
@@ -44734,7 +45418,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx2") {
++  source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -44743,8 +45427,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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" ]
@@ -44765,7 +45449,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qb4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -44774,8 +45458,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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" ]
@@ -44799,23 +45483,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f16-qc2w-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-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-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" ]
@@ -44836,23 +45516,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qd8-f16-qc2w-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-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-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" ]
@@ -44876,22 +45552,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-f16-qc2w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnni-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512vnni-prfm.c"
++      "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" ]
@@ -44912,22 +45583,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc2w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnni-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512vnni-prfm.c"
++      "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" ]
@@ -44951,23 +45617,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc2w-gemm_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnnigfni-prfm.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -44988,23 +45645,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc2w-gemm_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnnigfni-prfm.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -45028,16 +45676,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -45045,8 +45687,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-16x64c4-minmax-avx512amx.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x64c4-minmax-avx512amx.c"
++      "src/src/qd8-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" ]
@@ -45067,16 +45709,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -45084,8 +45720,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-16x64c4-minmax-avx512amx.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x64c4-minmax-avx512amx.c"
++      "src/src/qd8-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" ]
@@ -45109,16 +45745,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_sse2-no-sse3") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-sse2-ld128.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-sse2-ld128.c"
++      "src/src/qd8-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" ]
@@ -45139,16 +45776,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-sse2-ld128.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-sse2-ld128.c"
++      "src/src/qd8-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" ]
@@ -45172,16 +45810,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -45202,16 +45845,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -45235,15 +45883,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_x64") {
++  source_set("qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-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-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" ]
@@ -45264,15 +45919,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-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-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" ]
@@ -45296,7 +45958,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -45307,8 +45969,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-5x8c8-minmax-avxvnni-prfm.c"
++      "src/src/qd8-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" ]
@@ -45329,7 +45991,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -45340,8 +46002,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-5x8c8-minmax-avxvnni-prfm.c"
++      "src/src/qd8-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" ]
@@ -45365,7 +46027,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -45374,8 +46036,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx2.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c8-minmax-avx2.c"
++      "src/src/qd8-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" ]
@@ -45396,7 +46058,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -45405,8 +46067,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx2.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c8-minmax-avx2.c"
++      "src/src/qd8-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" ]
@@ -45430,7 +46092,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -45443,10 +46105,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512skx-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx256skx.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x16c8-minmax-avx512skx-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x8c8-minmax-avx256skx.c"
++      "src/src/qd8-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" ]
@@ -45467,7 +46127,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -45480,10 +46140,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512skx-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx256skx.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x16c8-minmax-avx512skx-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x8c8-minmax-avx256skx.c"
++      "src/src/qd8-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" ]
@@ -45507,7 +46165,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-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",
@@ -45521,8 +46179,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-10x16c8-minmax-avx512vnni-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512vnni-prfm.c"
++      "src/src/qd8-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" ]
@@ -45543,7 +46201,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -45557,8 +46215,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-10x16c8-minmax-avx512vnni-prfm.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512vnni-prfm.c"
++      "src/src/qd8-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" ]
@@ -45582,7 +46240,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
 +      "-mamx-int8",
 +    "-mamx-tile",
@@ -45599,8 +46257,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-16x64c4-minmax-avx512amx.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x64c4-minmax-avx512amx.c"
++      "src/src/qd8-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" ]
@@ -45621,7 +46279,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
 +      "-mamx-int8",
 +    "-mamx-tile",
@@ -45638,8 +46296,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-16x64c4-minmax-avx512amx.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x64c4-minmax-avx512amx.c"
++      "src/src/qd8-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" ]
@@ -45663,16 +46321,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_sse2-no-sse3") {
++  source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -45693,16 +46354,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -45726,16 +46390,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -45756,16 +46421,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-igemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -45789,16 +46455,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_x64") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -45819,16 +46490,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -45852,19 +46528,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -45885,19 +46564,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -45921,17 +46603,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2") {
++  source_set("qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mavx2",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -45952,17 +46642,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -45986,23 +46684,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -46023,23 +46716,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -46063,22 +46751,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-10x16c8-minmax-avx512vnni-prfm.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-avx512vnni-prfm.c"
++      "src/src/qd8-f32-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" ]
@@ -46099,22 +46782,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-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-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-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" ]
@@ -46138,25 +46816,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
++      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
 +    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-16x64c4-minmax-avx512amx.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x64c4-minmax-avx512amx.c"
++      "src/src/qd8-f32-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" ]
@@ -46177,25 +46852,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
++      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
 +    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-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-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" ]
@@ -46219,16 +46891,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_sse2-no-sse3") {
++  source_set("qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse2-ld64.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse2-ld64.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" ]
@@ -46249,16 +46928,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse2-ld64.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse2-ld64.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" ]
@@ -46282,16 +46968,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2") {
++  source_set("qd8-f32-qb4w-gemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -46312,16 +46998,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-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" ]
@@ -46345,16 +47031,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_x64") {
++  source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-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-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" ]
@@ -46375,16 +47061,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-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-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" ]
@@ -46408,18 +47094,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qd8-f32-qb4w-gemm_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c"
++      "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" ]
@@ -46440,18 +47123,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-gemm_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c"
++      "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" ]
@@ -46475,17 +47155,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_f16c-fma-avx2") {
++  source_set("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -46506,17 +47188,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -46540,21 +47224,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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-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" ]
@@ -46575,21 +47255,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc2w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-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-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" ]
@@ -46613,16 +47289,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_sse2-no-sse3") {
++  source_set("qd8-f32-qc2w-gemm_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46643,16 +47317,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc2w-gemm_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -46676,16 +47348,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_sse4.1-no-sse4.2") {
++  source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -46706,16 +47381,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    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-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" ]
@@ -46739,17 +47417,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_x64") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-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-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" ]
@@ -46770,17 +47448,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-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-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" ]
@@ -46804,16 +47482,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f16-vcvt_f16c-fma-avx2") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.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" ]
@@ -46834,16 +47519,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.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" ]
@@ -46867,17 +47559,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qd8-f32-qc4w-gemm_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-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.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" ]
@@ -46898,17 +47595,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_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-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.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" ]
@@ -46932,16 +47634,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_f16c-fma-avx2") {
++  source_set("qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.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" ]
@@ -46962,16 +47671,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.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" ]
@@ -46995,20 +47711,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qc4w-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-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.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" ]
@@ -47029,20 +47750,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-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-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.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" ]
@@ -47066,7 +47792,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_sse2-no-sse3") {
++  source_set("qd8-f32-qc4w-gemm_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -47074,7 +47800,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.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" ]
@@ -47095,7 +47822,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -47103,7 +47830,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.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" ]
@@ -47127,15 +47855,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_sse4.1-no-sse4.2") {
++  source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.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" ]
@@ -47156,15 +47885,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc4w-gemm_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.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" ]
@@ -47188,14 +47918,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_x64") {
++  source_set("qd8-f32-qc4w-gemm_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.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" ]
@@ -47216,14 +47947,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc4w-gemm_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.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" ]
@@ -47247,7 +47979,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -47258,8 +47990,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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/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" ]
@@ -47280,7 +48012,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -47291,8 +48023,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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/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" ]
@@ -47316,7 +48048,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_f16c-fma-avx2") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -47325,7 +48057,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.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" ]
@@ -47346,7 +48079,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -47355,7 +48088,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.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" ]
@@ -47379,23 +48113,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
-+    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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/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" ]
@@ -47416,23 +48150,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
-+    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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/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" ]
@@ -47456,17 +48190,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_x64") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -47487,17 +48226,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -47521,10 +48265,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -47532,8 +48282,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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/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" ]
@@ -47554,10 +48304,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
++      "-mamx-int8",
++    "-mamx-tile",
++    "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -47565,8 +48321,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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/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" ]
@@ -47590,17 +48346,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_f16c-fma-avx2") {
++  source_set("qd8-f32-qc8w-gemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -47621,17 +48376,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -47655,21 +48409,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qc8w-gemm_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-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/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" ]
@@ -47690,21 +48439,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-gemm_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-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/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" ]
@@ -47728,17 +48472,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_x64") {
++  source_set("qd8-f32-qc8w-gemm_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-minmax-fp32-scalar-fmagic.c"
++      "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" ]
@@ -47759,17 +48502,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-gemm_x64_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/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" ]
@@ -47793,18 +48535,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qd8-f32-qc8w-igemm_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-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/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" ]
@@ -47825,18 +48568,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-avx-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-avx-madd-prfm.c"
++      "src/src/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" ]
@@ -47860,19 +48604,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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/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" ]
@@ -47893,19 +48635,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-igemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    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/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" ]
@@ -47929,17 +48669,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx2") {
++  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-avx2-madd-prfm.c"
++      "src/src/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" ]
@@ -47960,17 +48706,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-avx2-madd-prfm.c"
++      "src/src/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" ]
@@ -47994,23 +48746,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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/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" ]
@@ -48031,23 +48782,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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/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" ]
@@ -48071,22 +48821,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qd8-f32-qc8w-igemm_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-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/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" ]
@@ -48107,22 +48860,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-igemm_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-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/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" ]
@@ -48146,16 +48902,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_ssse3-no-sse4.1") {
++  source_set("qd8-f32-qc8w-igemm_sse2-no-sse3") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -48176,16 +48932,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-igemm_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/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" ]
@@ -48209,15 +48965,79 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_x64") {
++  source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2") {
 +    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse41-ld64.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse41-ld64.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
++    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-1x4c8-minmax-sse41-ld64.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse41-ld64.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qd8-f32-qc8w-igemm_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48238,15 +49058,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-igemm_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/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" ]
@@ -48270,7 +49091,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -48280,9 +49101,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c"
++      "src/src/qs8-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" ]
@@ -48303,7 +49123,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -48313,9 +49133,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c"
++      "src/src/qs8-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" ]
@@ -48339,7 +49158,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_f16c-fma-avx2") {
++  source_set("qs8-dwconv_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -48348,9 +49167,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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" ]
@@ -48371,7 +49189,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -48380,9 +49198,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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" ]
@@ -48406,7 +49223,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -48419,9 +49236,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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" ]
@@ -48442,7 +49258,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -48455,9 +49271,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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" ]
@@ -48481,7 +49296,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_sse2-no-sse3") {
++  source_set("qs8-dwconv_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -48489,9 +49304,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c"
++      "src/src/qs8-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" ]
@@ -48512,7 +49326,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_sse2-no-sse3_standalone") {
++  source_set("qs8-dwconv_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -48520,9 +49334,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c"
++      "src/src/qs8-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" ]
@@ -48546,7 +49359,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2") {
++  source_set("qs8-dwconv_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -48554,9 +49367,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -48577,7 +49389,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -48585,9 +49397,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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-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" ]
@@ -48611,19 +49422,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_x64") {
++  source_set("qs8-dwconv_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "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" ]
@@ -48644,19 +49453,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_x64_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-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" ]
@@ -48680,18 +49487,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-f16-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48712,18 +49517,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48747,19 +49550,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-f32-vcvt_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/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-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48780,19 +49581,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_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/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-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48816,19 +49615,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") {
++  source_set("qs8-f32-vcvt_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnniint8",
 +    "-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-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48849,19 +49645,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnniint8",
 +    "-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-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48885,17 +49678,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx2") {
++  source_set("qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-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-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48916,17 +49712,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48950,23 +49749,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-f32-vcvt_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -48987,23 +49778,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49027,22 +49810,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-f32-vcvt_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-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-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49063,22 +49839,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_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-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-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49102,16 +49871,69 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_x64") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-f32-vcvt_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") {
++    cflags = [
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -49119,8 +49941,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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" ]
@@ -49141,16 +49963,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mamx-int8",
-+    "-mamx-tile",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
 +    "-mfma",
 +    "-mgfni"
@@ -49158,8 +49974,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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" ]
@@ -49183,16 +49999,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_sse2-no-sse3") {
++  source_set("qs8-packw_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-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-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49213,16 +50029,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-packw_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-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-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -49246,16 +50062,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2") {
++  source_set("qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-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-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" ]
@@ -49276,16 +50099,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-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-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" ]
@@ -49309,15 +50139,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_x64") {
++  source_set("qs8-packw_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-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" ]
@@ -49338,15 +50170,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-packw_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-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" ]
@@ -49370,18 +50204,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_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-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-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" ]
@@ -49402,18 +50237,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-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-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" ]
@@ -49437,19 +50273,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-qc2w-gemm_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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-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" ]
@@ -49470,19 +50304,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc2w-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
-+    "-mavxvnni",
 +    "-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-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" ]
@@ -49506,19 +50338,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni") {
++  source_set("qs8-qc2w-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-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-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" ]
@@ -49539,19 +50373,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc2w-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-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-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" ]
@@ -49575,17 +50411,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx2") {
++  source_set("qs8-qc2w-gemm_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx2.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x8c8-minmax-fp32-avx2.c"
++      "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" ]
@@ -49606,17 +50442,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc2w-gemm_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx2.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x8c8-minmax-fp32-avx2.c"
++      "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" ]
@@ -49640,23 +50476,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -49677,23 +50508,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -49717,22 +50543,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-qc4w-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/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-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" ]
@@ -49753,22 +50576,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-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/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-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" ]
@@ -49792,25 +50612,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-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/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-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" ]
@@ -49831,25 +50643,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-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/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-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" ]
@@ -49873,16 +50677,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_sse2-no-sse3") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-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-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" ]
@@ -49903,16 +50714,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-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-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" ]
@@ -49936,16 +50754,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2") {
++  source_set("qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-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-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" ]
@@ -49966,16 +50790,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-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-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" ]
@@ -49999,15 +50829,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_x64") {
++  source_set("qs8-qc4w-gemm_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-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" ]
@@ -50028,15 +50859,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-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" ]
@@ -50060,18 +50892,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-qc4w-gemm_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c"
++      "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" ]
@@ -50092,18 +50921,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mavxvnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c"
++      "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" ]
@@ -50127,21 +50953,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.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" ]
@@ -50162,21 +50986,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.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" ]
@@ -50200,14 +51022,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_x64") {
++  source_set("qs8-qc8w-dwconv_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.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" ]
@@ -50228,14 +51054,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.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" ]
@@ -50259,16 +51089,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_f16c-fma-avx2") {
++  source_set("qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.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" ]
@@ -50289,16 +51125,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.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" ]
@@ -50322,20 +51164,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc8w-dwconv_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.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" ]
@@ -50356,20 +51195,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.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" ]
@@ -50393,7 +51229,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_sse4.1-no-sse4.2") {
++  source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -50401,7 +51237,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.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" ]
@@ -50422,7 +51260,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -50430,7 +51268,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.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" ]
@@ -50454,14 +51294,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_x64") {
++  source_set("qs8-qc8w-dwconv_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.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" ]
@@ -50482,14 +51327,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.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" ]
@@ -50513,7 +51363,74 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni") {
++  source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
++    cflags = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-avx-ld128.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++    cflags = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-avx-ld128.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -50524,7 +51441,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.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" ]
@@ -50545,7 +51463,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mavxvnni",
@@ -50556,7 +51474,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.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" ]
@@ -50580,16 +51499,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_f16c-fma-avx2") {
++  source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnniint8",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.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" ]
@@ -50610,16 +51532,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnniint8",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.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" ]
@@ -50643,7 +51568,72 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx2") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx2.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x8c8-minmax-fp32-avx2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx2_standalone") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx2.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x8c8-minmax-fp32-avx2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -50656,8 +51646,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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" ]
@@ -50678,7 +51670,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -50691,8 +51683,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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" ]
@@ -50716,7 +51710,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++  source_set("qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -50730,7 +51724,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.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" ]
@@ -50751,7 +51746,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -50765,7 +51760,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.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" ]
@@ -50789,15 +51785,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_ssse3-no-sse4.1") {
++  source_set("qs8-qc8w-gemm_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-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" ]
@@ -50818,15 +51824,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_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-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" ]
@@ -50850,14 +51866,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_x64") {
++  source_set("qs8-qc8w-gemm_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-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" ]
@@ -50878,14 +51896,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_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-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" ]
@@ -50909,17 +51929,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.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" ]
@@ -50940,17 +51959,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.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" ]
@@ -50974,16 +51992,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_f16c-fma-avx2") {
++  source_set("qs8-qc8w-gemm_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-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" ]
@@ -51004,16 +52021,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_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-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" ]
@@ -51037,20 +52053,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc8w-igemm_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/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -51071,20 +52085,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-igemm_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/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -51108,15 +52120,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_sse2-no-sse3") {
++  source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mavxvnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.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" ]
@@ -51137,15 +52153,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.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" ]
@@ -51169,15 +52189,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_sse4.1-no-sse4.2") {
++  source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mavxvnniint8",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.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" ]
@@ -51198,15 +52222,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mavxvnniint8",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.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" ]
@@ -51230,15 +52258,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_x64") {
++  source_set("qs8-qc8w-igemm_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-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" ]
@@ -51259,15 +52289,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-igemm_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-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" ]
@@ -51291,17 +52323,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qc8w-igemm_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-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" ]
@@ -51322,17 +52360,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-igemm_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-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" ]
@@ -51356,16 +52400,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_f16c-fma-avx2") {
++  source_set("qs8-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-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.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" ]
@@ -51386,16 +52436,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.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" ]
@@ -51419,20 +52475,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-qc8w-igemm_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-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -51453,20 +52514,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-igemm_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-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -51490,7 +52556,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_sse2-no-sse3") {
++  source_set("qs8-qc8w-igemm_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -51498,7 +52564,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.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" ]
@@ -51519,7 +52586,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-igemm_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -51527,7 +52594,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.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" ]
@@ -51551,7 +52619,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_sse4.1-no-sse4.2") {
++  source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -51559,7 +52627,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-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" ]
@@ -51580,7 +52649,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -51588,7 +52657,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-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" ]
@@ -51612,15 +52682,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_x64") {
++  source_set("qs8-qc8w-igemm_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
++      "src/src/qs8-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" ]
@@ -51641,15 +52711,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-igemm_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
++      "src/src/qs8-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" ]
@@ -51673,17 +52743,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-qu8-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-vcvt/gen/qs8-vcvt-avx-u32.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51704,17 +52775,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qu8-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-vcvt/gen/qs8-vcvt-avx-u32.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-goi-avxvnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51738,16 +52810,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_f16c-fma-avx2") {
++  source_set("qs8-qu8-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-vcvt/gen/qs8-vcvt-avx2-u32.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51768,16 +52845,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qu8-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-vcvt/gen/qs8-vcvt-avx2-u32.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51801,15 +52883,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_sse2-no-sse3") {
++  source_set("qs8-qu8-packw_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51830,15 +52911,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qu8-packw_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-sse2-u32.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51862,15 +52942,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_sse4.1-no-sse4.2") {
++  source_set("qs8-rdsum_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51891,15 +52972,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-u32.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51923,15 +53005,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_ssse3-no-sse4.1") {
++  source_set("qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51952,15 +53039,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-u32.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -51984,14 +53076,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_x64") {
++  source_set("qs8-rdsum_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52012,14 +53105,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52043,17 +53137,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-rdsum_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52074,17 +53165,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52108,16 +53196,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_f16c-fma-avx2") {
++  source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52138,16 +53228,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_f16c-fma-avx2_standalone") {
++  source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni_standalone") {
 +    cflags = [
 +      "-mavx2",
++    "-mavxvnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52171,15 +53263,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_sse2-no-sse3") {
++  source_set("qs8-rsum_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52200,15 +53293,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52232,15 +53326,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_sse4.1-no-sse4.2") {
++  source_set("qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
++      "src/src/qs8-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" ]
@@ -52261,15 +53361,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
++      "src/src/qs8-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" ]
@@ -52293,15 +53399,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_ssse3-no-sse4.1") {
++  source_set("qs8-rsum_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-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52322,15 +53434,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_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-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52354,14 +53472,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_x64") {
++  source_set("qs8-rsum_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52382,14 +53501,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52413,80 +53533,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-rsum_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qs8-vmul_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52507,15 +53561,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52539,15 +53592,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_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-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52568,15 +53623,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52600,14 +53657,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_x64") {
++  source_set("qs8-vadd_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52628,14 +53687,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52659,17 +53720,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vadd_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-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52690,17 +53754,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd_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-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52724,7 +53791,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_sse2-no-sse3") {
++  source_set("qs8-vadd_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -52732,7 +53799,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52753,7 +53820,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -52761,7 +53828,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52785,7 +53852,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_sse4.1-no-sse4.2") {
++  source_set("qs8-vadd_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -52793,7 +53860,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52814,7 +53881,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -52822,7 +53889,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52846,14 +53913,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_x64") {
++  source_set("qs8-vadd_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52874,14 +53942,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52905,16 +53974,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_f16c-fma-avx2") {
++  source_set("qs8-vaddc_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-vprelu/gen/qs8-vprelu-avx2-u16.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52935,16 +54005,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_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-vprelu/gen/qs8-vprelu-avx2-u16.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52968,14 +54039,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_x64") {
++  source_set("qs8-vaddc_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -52996,14 +54069,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53027,16 +54102,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_f16c-fma-avx2") {
++  source_set("qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53057,16 +54136,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53090,14 +54173,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_x64") {
++  source_set("qs8-vaddc_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-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53118,14 +54202,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_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-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53149,16 +54234,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_f16c-fma-avx2") {
++  source_set("qs8-vaddc_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-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53179,16 +54263,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_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-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53212,14 +54295,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_x64") {
++  source_set("qs8-vaddc_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.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" ]
@@ -53240,14 +54324,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.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" ]
@@ -53271,7 +54356,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -53281,8 +54366,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx-mul16.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx-mul16.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53303,7 +54387,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -53313,8 +54397,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx-mul16.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx-mul16.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53338,7 +54421,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_f16c-fma-avx2") {
++  source_set("qs8-vcvt_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -53347,8 +54430,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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-vcvt/gen/qs8-vcvt-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53369,7 +54451,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -53378,81 +54460,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx2-mul32.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53476,7 +54484,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_sse2-no-sse3") {
++  source_set("qs8-vcvt_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -53484,8 +54492,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt/gen/qs8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53506,7 +54513,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -53514,8 +54521,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt/gen/qs8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53539,7 +54545,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_sse4.1-no-sse4.2") {
++  source_set("qs8-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -53547,8 +54553,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt/gen/qs8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53569,7 +54574,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -53577,8 +54582,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt/gen/qs8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53602,17 +54606,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_x64") {
++  source_set("qs8-vcvt_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-vcvt/gen/qs8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53633,17 +54635,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-vcvt/gen/qs8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53667,17 +54667,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vcvt_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53698,17 +54695,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53732,16 +54726,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_f16c-fma-avx2") {
++  source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53762,16 +54757,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53795,20 +54791,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-vlrelu_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53829,20 +54821,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlrelu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53866,7 +54854,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_sse2-no-sse3") {
++  source_set("qs8-vlrelu_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -53874,7 +54862,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53895,7 +54883,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlrelu_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -53903,7 +54891,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53927,7 +54915,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_sse4.1-no-sse4.2") {
++  source_set("qs8-vlrelu_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -53935,7 +54923,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53956,7 +54944,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlrelu_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -53964,7 +54952,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -53988,14 +54976,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_x64") {
++  source_set("qs8-vlrelu_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54016,14 +55005,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_x64_standalone") {
++  source_set("qs8-vlrelu_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54047,18 +55037,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vlrelu_x64") {
 +    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-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54079,18 +55065,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("qs8-vlrelu_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"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54114,17 +55096,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_f16c-fma-avx2") {
++  source_set("qs8-vmul_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54145,17 +55127,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vmul_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54179,21 +55161,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qs8-vmul_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54214,21 +55190,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vmul_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54252,16 +55222,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_sse2-no-sse3") {
++  source_set("qs8-vmul_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54282,16 +55251,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vmul_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54315,16 +55283,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_sse4.1-no-sse4.2") {
++  source_set("qs8-vmul_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-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54345,16 +55311,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vmul_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-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54378,15 +55342,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_x64") {
++  source_set("qs8-vmulc_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54407,15 +55373,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54439,18 +55407,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qs8-vmulc_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54471,18 +55436,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vmulc_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54506,17 +55468,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_f16c-fma-avx2") {
++  source_set("qs8-vmulc_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54537,17 +55497,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vmulc_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54571,89 +55529,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-7x16c8-minmax-fp32-avx512skx-prfm.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("qs8-vmulc_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-7x16c8-minmax-fp32-avx512skx-prfm.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qu8-igemm_sse2-no-sse3") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-ld64.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54674,16 +55557,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vmulc_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-ld64.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54707,16 +55588,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_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-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/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54737,16 +55618,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vprelu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54770,15 +55651,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_x64") {
++  source_set("qs8-vprelu_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54799,15 +55679,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vprelu_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54831,15 +55710,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_ssse3-no-sse4.1") {
++  source_set("qs8-vpreluc_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/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54860,15 +55740,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vpreluc_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/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54892,14 +55773,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_x64") {
++  source_set("qs8-vpreluc_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54920,14 +55801,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vpreluc_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54951,7 +55832,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_f16c-fma-avx2") {
++  source_set("qs8-vrpreluc_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -54960,7 +55841,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -54981,7 +55862,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vrpreluc_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -54990,7 +55871,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55014,15 +55895,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_sse2-no-sse3") {
++  source_set("qs8-vrpreluc_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55043,15 +55923,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vrpreluc_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55075,14 +55954,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_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-rsum/gen/qu8-rsum-scalar-u4.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" ]
@@ -55103,14 +55986,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_x64_standalone") {
++  source_set("qu8-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-rsum/gen/qu8-rsum-scalar-u4.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" ]
@@ -55134,17 +56021,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_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-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.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" ]
@@ -55165,17 +56052,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.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" ]
@@ -55199,16 +56086,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_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-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.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" ]
@@ -55229,16 +56121,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.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" ]
@@ -55262,20 +56159,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_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-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -55296,20 +56189,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.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" ]
@@ -55333,15 +56222,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_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-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.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" ]
@@ -55362,15 +56252,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.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" ]
@@ -55394,15 +56285,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_sse4.1-no-sse4.2") {
++  source_set("qu8-dwconv_x64") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55423,15 +56316,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c"
++      "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" ]
@@ -55455,15 +56350,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_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-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55484,15 +56381,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55516,17 +56415,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-f32-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55547,17 +56445,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55581,16 +56478,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_f16c-fma-avx2") {
++  source_set("qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55611,16 +56512,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55644,20 +56549,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qu8-f32-vcvt_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55678,20 +56578,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55715,15 +56610,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_sse2-no-sse3") {
++  source_set("qu8-f32-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55744,15 +56639,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55776,15 +56671,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_sse4.1-no-sse4.2") {
++  source_set("qu8-f32-vcvt_x64") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55805,15 +56699,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -55837,15 +56730,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_x64") {
++  source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.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" ]
@@ -55866,15 +56762,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.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" ]
@@ -55898,17 +56797,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-gemm_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.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" ]
@@ -55929,17 +56828,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.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" ]
@@ -55963,16 +56862,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_f16c-fma-avx2") {
++  source_set("qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.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" ]
@@ -55993,16 +56897,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.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" ]
@@ -56026,7 +56935,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_sse2-no-sse3") {
++  source_set("qu8-gemm_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -56034,7 +56943,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.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" ]
@@ -56055,7 +56965,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -56063,7 +56973,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.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" ]
@@ -56087,7 +56998,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_sse4.1-no-sse4.2") {
++  source_set("qu8-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -56095,7 +57006,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.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" ]
@@ -56116,7 +57028,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -56124,7 +57036,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.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" ]
@@ -56148,15 +57061,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_ssse3-no-sse4.1") {
++  source_set("qu8-gemm_x64") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.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" ]
@@ -56177,15 +57090,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_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-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" ]
@@ -56209,14 +57122,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_x64") {
++  source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.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" ]
@@ -56237,14 +57154,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.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" ]
@@ -56268,17 +57189,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-igemm_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-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" ]
@@ -56299,17 +57220,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-igemm_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-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" ]
@@ -56333,16 +57254,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_f16c-fma-avx2") {
++  source_set("qu8-igemm_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-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" ]
@@ -56363,16 +57289,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-igemm_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-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" ]
@@ -56396,7 +57327,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_sse2-no-sse3") {
++  source_set("qu8-igemm_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -56404,7 +57335,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.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" ]
@@ -56425,7 +57357,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-igemm_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -56433,7 +57365,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.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" ]
@@ -56457,7 +57390,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_sse4.1-no-sse4.2") {
++  source_set("qu8-igemm_sse4.1-no-sse4.2") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -56465,7 +57398,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.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" ]
@@ -56486,7 +57420,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-igemm_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
 +      "-mno-sse4.2",
 +    "-msse4.1"
@@ -56494,7 +57428,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.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" ]
@@ -56518,15 +57453,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_ssse3-no-sse4.1") {
++  source_set("qu8-igemm_x64") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.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" ]
@@ -56547,15 +57482,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-igemm_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-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" ]
@@ -56579,14 +57514,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_x64") {
++  source_set("qu8-rdsum_ssse3-no-sse4.1") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56607,14 +57543,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56638,17 +57575,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-rdsum_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56669,17 +57603,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56703,15 +57634,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_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-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56732,15 +57664,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56764,15 +57697,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_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-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56793,15 +57726,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_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-rsum/gen/qu8-rsum-sse2-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56825,14 +57758,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_x64") {
++  source_set("qu8-rsum_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56853,14 +57786,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56884,7 +57817,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma") {
++  source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -56894,7 +57827,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56915,7 +57848,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
 +      "-mavx",
 +    "-mno-avx2",
@@ -56925,7 +57858,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56949,15 +57882,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_sse2-no-sse3") {
++  source_set("qu8-vadd_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -56978,15 +57912,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57010,15 +57945,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_sse4.1-no-sse4.2") {
++  source_set("qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57039,15 +57979,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57071,14 +58016,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_x64") {
++  source_set("qu8-vadd_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-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57099,14 +58045,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd_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-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57130,16 +58077,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_f16c-fma-avx2") {
++  source_set("qu8-vadd_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-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57160,16 +58106,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd_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-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57193,14 +58138,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_x64") {
++  source_set("qu8-vadd_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.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" ]
@@ -57221,14 +58167,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.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" ]
@@ -57252,16 +58199,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_f16c-fma-avx2") {
++  source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57282,16 +58230,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57315,14 +58264,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_x64") {
++  source_set("qu8-vaddc_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57343,14 +58294,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57374,16 +58327,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_f16c-fma-avx2") {
++  source_set("qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mavx2",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57404,16 +58361,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_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-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57437,14 +58398,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_x64") {
++  source_set("qu8-vaddc_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-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57465,14 +58427,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_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-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57496,16 +58459,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("reference_x64") {
++  source_set("qu8-vaddc_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-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57526,16 +58488,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_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-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57559,15 +58520,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_sse2-no-sse3") {
++  source_set("qu8-vaddc_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.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" ]
@@ -57588,15 +58549,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.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" ]
@@ -57620,15 +58581,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_sse4.1-no-sse4.2") {
++  source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57649,15 +58612,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57681,14 +58646,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_x64") {
++  source_set("qu8-vcvt_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57709,14 +58676,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57740,15 +58709,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_sse4.1-no-sse4.2") {
++  source_set("qu8-vcvt_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-vcvt/gen/qu8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57769,15 +58738,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt_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-vcvt/gen/qu8-vcvt-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57801,14 +58770,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_x64") {
++  source_set("qu8-vcvt_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-vcvt/gen/qu8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57829,14 +58799,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt_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-vcvt/gen/qu8-vcvt-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57860,16 +58831,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_sse4.1-no-sse4.2") {
++  source_set("qu8-vcvt_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-vcvt/gen/qu8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57890,16 +58860,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    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-vcvt/gen/qu8-vcvt-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57923,15 +58892,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_x64") {
++  source_set("qu8-vcvt_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57952,15 +58920,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -57984,17 +58951,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_sse4.1-no-sse4.2") {
++  source_set("qu8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-vlrelu/gen/qu8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58015,17 +58982,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-vlrelu/gen/qu8-vlrelu-avx-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58049,16 +59016,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_x64") {
++  source_set("qu8-vlrelu_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-vlrelu/gen/qu8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58079,16 +59046,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlrelu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-vlrelu/gen/qu8-vlrelu-avx2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58112,16 +59079,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_f16c-fma-avx2") {
++  source_set("qu8-vlrelu_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58142,16 +59108,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlrelu_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58175,20 +59140,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("qu8-vlrelu_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/s8-vclamp/s8-vclamp-avx512skx-u256.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58209,20 +59169,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlrelu_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/s8-vclamp/s8-vclamp-avx512skx-u256.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58246,15 +59201,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_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-vclamp/s8-vclamp-sse2-u64.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58275,15 +59230,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlrelu_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse2-u64.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58307,15 +59262,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_sse4.1-no-sse4.2") {
++  source_set("qu8-vlrelu_x64") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58336,15 +59290,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlrelu_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-sse41-u64.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58368,14 +59321,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_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-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58396,14 +59352,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58427,42 +59386,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("subgraph_x64") {
++  source_set("qu8-vmul_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/rope.c",
-+    "src/src/subgraph/softmax.c",
-+    "src/src/subgraph/space-to-depth-2d.c",
-+    "src/src/subgraph/static-constant-pad.c",
-+    "src/src/subgraph/static-reduce.c",
-+    "src/src/subgraph/static-resize-bilinear-2d.c",
-+    "src/src/subgraph/static-slice.c",
-+    "src/src/subgraph/static-transpose.c",
-+    "src/src/subgraph/subgraph-utils.c",
-+    "src/src/subgraph/unary.c",
-+    "src/src/subgraph/unpooling-2d.c",
-+    "src/src/subgraph/validation.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58483,42 +59415,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vmul_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/rope.c",
-+    "src/src/subgraph/softmax.c",
-+    "src/src/subgraph/space-to-depth-2d.c",
-+    "src/src/subgraph/static-constant-pad.c",
-+    "src/src/subgraph/static-reduce.c",
-+    "src/src/subgraph/static-resize-bilinear-2d.c",
-+    "src/src/subgraph/static-slice.c",
-+    "src/src/subgraph/static-transpose.c",
-+    "src/src/subgraph/subgraph-utils.c",
-+    "src/src/subgraph/unary.c",
-+    "src/src/subgraph/unpooling-2d.c",
-+    "src/src/subgraph/validation.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58542,22 +59447,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("tables_x64") {
++  source_set("qu8-vmul_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58578,22 +59476,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vmul_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58617,15 +59508,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_sse2-no-sse3") {
++  source_set("qu8-vmul_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58646,15 +59536,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vmul_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58678,15 +59567,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_sse4.1-no-sse4.2") {
++  source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58707,15 +59598,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58739,14 +59632,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_x64") {
++  source_set("qu8-vmulc_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58767,14 +59661,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vmulc_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58798,14 +59693,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-lut32norm_x64") {
++  source_set("qu8-vmulc_sse4.1-no-sse4.2") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58826,14 +59722,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-lut32norm_x64_standalone") {
++  source_set("qu8-vmulc_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58857,15 +59754,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_sse2-no-sse3") {
++  source_set("qu8-vmulc_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58886,15 +59782,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vmulc_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58918,14 +59813,77 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_x64") {
++  source_set("qu8-vprelu_f16c-fma-avx2") {
 +    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-vprelu_f16c-fma-avx2_standalone") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qu8-vprelu_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58946,14 +59904,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vprelu_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -58977,16 +59935,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_sse2-no-sse3") {
++  source_set("qu8-vpreluc_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59007,16 +59965,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vpreluc_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59040,15 +59998,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_x64") {
++  source_set("qu8-vpreluc_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/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59069,15 +60026,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vpreluc_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/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59101,17 +60057,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_sse2-no-sse3") {
++  source_set("qu8-vrpreluc_f16c-fma-avx2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-sse2-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-sse2-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-sse2-u32-acc2.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59132,17 +60087,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vrpreluc_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-sse2-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-sse2-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-sse2-u32-acc2.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59166,16 +60120,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_x64") {
++  source_set("qu8-vrpreluc_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/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59196,16 +60148,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vrpreluc_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/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59229,16 +60179,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_f16c-fma-avx2") {
++  source_set("reference_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-avx2-u128.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59259,16 +60209,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("reference_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-avx2-u128.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59292,20 +60242,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("s8-ibilinear_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59326,20 +60271,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-ibilinear_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59363,15 +60303,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_sse2-no-sse3") {
++  source_set("s8-ibilinear_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-sse2-u64.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59392,15 +60332,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-ibilinear_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-sse2-u64.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59424,14 +60364,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_x64") {
++  source_set("s8-ibilinear_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59452,14 +60392,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-ibilinear_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59483,16 +60423,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-packw_f16c-fma-avx2") {
++  source_set("s8-maxpool_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59513,16 +60452,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-packw_f16c-fma-avx2_standalone") {
++  source_set("s8-maxpool_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59546,16 +60484,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_f16c-fma-avx2") {
++  source_set("s8-maxpool_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59576,16 +60512,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-maxpool_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-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59609,15 +60543,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_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/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.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" ]
@@ -59638,15 +60573,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rdminmax_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.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" ]
@@ -59670,14 +60606,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_x64") {
++  source_set("s8-rdminmax_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.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" ]
@@ -59698,14 +60635,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rdminmax_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.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" ]
@@ -59729,15 +60667,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_x64") {
++  source_set("s8-rminmax_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/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" ]
@@ -59758,15 +60698,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rminmax_sse4.1-no-sse4.2_standalone") {
 +    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/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" ]
@@ -59790,15 +60732,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x24-transposec_ssse3-no-sse4.1") {
++  source_set("s8-rminmax_x64") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/x24-transposec-4x4-ssse3.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" ]
@@ -59819,15 +60762,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rminmax_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/x24-transposec-4x4-ssse3.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" ]
@@ -59851,14 +60795,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x24-transposec_x64") {
++  source_set("s8-vclamp_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
++      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59879,14 +60825,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
++      "src/src/s8-vclamp/s8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59910,21 +60858,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_avx-no-avx2-no-f16c-no-fma") {
++  source_set("s8-vclamp_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/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/s8-vclamp/s8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59945,21 +60892,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_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/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/s8-vclamp/s8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -59983,18 +60929,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_avx512f") {
++  source_set("s8-vclamp_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/s8-vclamp/s8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60015,18 +60958,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/s8-vclamp/s8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60050,16 +60990,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_sse2-no-sse3") {
++  source_set("s8-vclamp_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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/s8-vclamp/s8-vclamp-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60080,16 +61019,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    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/s8-vclamp/s8-vclamp-sse41-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60113,19 +61051,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_x64") {
++  source_set("s8-vclamp_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/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60146,19 +61079,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_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/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60182,17 +61110,43 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_avx-no-avx2-no-f16c-no-fma") {
++  source_set("subgraph_x64") {
 +    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"
++      "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" ]
@@ -60213,17 +61167,43 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("subgraph_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-8x8-reuse-multi-avx.c"
++      "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" ]
@@ -60247,15 +61227,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_sse-no-sse2") {
++  source_set("tables_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/x32-transposec-4x4-sse.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" ]
@@ -60276,15 +61263,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("tables_x64_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/x32-transposec-4x4-sse.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" ]
@@ -60308,14 +61302,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_x64") {
++  source_set("u8-ibilinear_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60336,14 +61331,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-ibilinear_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60367,15 +61363,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-unpool_sse2-no-sse3") {
++  source_set("u8-ibilinear_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-sse2.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60396,15 +61392,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-ibilinear_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-sse2.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60428,14 +61424,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-unpool_x64") {
++  source_set("u8-ibilinear_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60456,14 +61452,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-ibilinear_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60487,17 +61483,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma") {
++  source_set("u8-lut32norm_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-lut32norm/u8-lut32norm-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60518,17 +61511,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-lut32norm_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-lut32norm/u8-lut32norm-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60552,7 +61542,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_sse2-no-sse3") {
++  source_set("u8-maxpool_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -60560,7 +61550,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60581,7 +61571,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-maxpool_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -60589,7 +61579,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60613,14 +61603,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_x64") {
++  source_set("u8-maxpool_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60641,14 +61631,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-maxpool_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60672,17 +61662,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_avx-no-avx2-no-f16c-no-fma") {
++  source_set("u8-rdminmax_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx-u64.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" ]
@@ -60703,17 +61692,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-rdminmax_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx-u64.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" ]
@@ -60737,16 +61725,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_f16c-fma-avx2") {
++  source_set("u8-rdminmax_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx2-u128.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" ]
@@ -60767,16 +61754,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-rdminmax_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx2-u128.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" ]
@@ -60800,20 +61786,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("u8-rminmax_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.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" ]
@@ -60834,20 +61817,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-rminmax_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.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" ]
@@ -60871,21 +61851,79 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi") {
++  source_set("u8-rminmax_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vbmi",
-+    "-mavx512vl",
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    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-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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("u8-vclamp_f16c-fma-avx2") {
++    cflags = [
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
++      "src/src/u8-vclamp/u8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60906,21 +61944,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-vclamp_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vbmi",
-+    "-mavx512vl",
++      "-mavx2",
 +    "-mf16c",
 +    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
++      "src/src/u8-vclamp/u8-vclamp-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60944,14 +61977,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_x64") {
++  source_set("u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -60972,14 +62011,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61003,14 +62048,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-packq_x64") {
++  source_set("u8-vclamp_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/u8-vclamp/u8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61031,14 +62077,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-vclamp_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/u8-vclamp/u8-vclamp-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61062,17 +62109,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-packw_x64") {
++  source_set("u8-vclamp_x64") {
 +    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-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61093,17 +62137,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-vclamp_x64_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-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61127,7 +62168,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_f16c-fma-avx2") {
++  source_set("x16-packw_f16c-fma-avx2") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -61136,7 +62177,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61157,7 +62198,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-packw_f16c-fma-avx2_standalone") {
 +    cflags = [
 +      "-mavx2",
 +    "-mf16c",
@@ -61166,7 +62207,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61190,7 +62231,70 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_sse2-no-sse3") {
++  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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-transposec_f16c-fma-avx2_standalone") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x16-transposec_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -61198,7 +62302,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c"
++      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61219,7 +62323,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-transposec_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -61227,7 +62331,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c"
++      "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61251,14 +62355,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_x64") {
++  source_set("x16-transposec_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61279,14 +62383,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-transposec_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61310,14 +62414,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-copy_x64") {
++  source_set("x16-x32-packw_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.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" ]
@@ -61338,14 +62443,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-x32-packw_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.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" ]
@@ -61369,15 +62475,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-fill_sse2-no-sse3") {
++  source_set("x24-transposec_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-sse2-u64.c"
++      "src/src/x24-transposec/x24-transposec-4x4-ssse3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61398,15 +62504,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x24-transposec_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-sse2-u64.c"
++      "src/src/x24-transposec/x24-transposec-4x4-ssse3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61430,14 +62536,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-fill_x64") {
++  source_set("x24-transposec_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61458,14 +62564,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x24-transposec_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61489,15 +62595,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-pad_sse2-no-sse3") {
++  source_set("x32-packw_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/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" ]
@@ -61518,15 +62630,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-packw_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/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" ]
@@ -61550,14 +62668,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-pad_x64") {
++  source_set("x32-packw_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.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" ]
@@ -61578,14 +62700,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-packw_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.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" ]
@@ -61609,14 +62735,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-transposev_x64") {
++  source_set("x32-packw_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.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" ]
@@ -61637,14 +62765,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-packw_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.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" ]
@@ -61667,19 +62797,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  }
 +}
 +
-+}
-+
-+if (current_cpu == "arm64") {
 +if (build_with_chromium) {
-+  source_set("bf16-f32-vcvt_arm64") {
++  source_set("x32-packw_x64") {
 +    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"
++      "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" ]
@@ -61700,15 +62831,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-packw_x64_standalone") {
 +    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"
++      "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" ]
@@ -61732,14 +62867,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("bf16-qs8-vcvt_arm64") {
++  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/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/x32-transposec/gen/x32-transposec-8x8-reuse-multi-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61760,14 +62898,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("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/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/x32-transposec/gen/x32-transposec-8x8-reuse-multi-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61791,19 +62932,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("bf16-rminmax_arm64") {
++  source_set("x32-transposec_sse-no-sse2") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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/x32-transposec/x32-transposec-4x4-sse.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61824,19 +62961,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-transposec_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    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/x32-transposec/x32-transposec-4x4-sse.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61860,37 +62993,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("configs_arm64") {
++  source_set("x32-transposec_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/configs/argmaxpool-config.c",
-+    "src/src/configs/avgpool-config.c",
-+    "src/src/configs/binary-elementwise-config.c",
-+    "src/src/configs/cmul-config.c",
-+    "src/src/configs/conv-hwc2chw-config.c",
-+    "src/src/configs/dwconv-config.c",
-+    "src/src/configs/dwconv2d-chw-config.c",
-+    "src/src/configs/gemm-config.c",
-+    "src/src/configs/hardware-config.c",
-+    "src/src/configs/ibilinear-chw-config.c",
-+    "src/src/configs/ibilinear-config.c",
-+    "src/src/configs/lut32norm-config.c",
-+    "src/src/configs/maxpool-config.c",
-+    "src/src/configs/pack-lh-config.c",
-+    "src/src/configs/raddstoreexpminusmax-config.c",
-+    "src/src/configs/reduce-config.c",
-+    "src/src/configs/spmm-config.c",
-+    "src/src/configs/transpose-config.c",
-+    "src/src/configs/unary-elementwise-config.c",
-+    "src/src/configs/unpool-config.c",
-+    "src/src/configs/vmulcaddc-config.c",
-+    "src/src/configs/x8-lut-config.c",
-+    "src/src/configs/xx-fill-config.c",
-+    "src/src/configs/xx-pad-config.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61911,37 +63021,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-transposec_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/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61965,18 +63052,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("enums_arm64") {
++  source_set("x32-unpool_sse2-no-sse3") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/x32-unpool/x32-unpool-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -61997,18 +63081,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-unpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+  
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/x32-unpool/x32-unpool-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62032,14 +63113,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-avgpool_arch=armv8.2-a+fp16") {
++  source_set("x32-unpool_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/x32-unpool/x32-unpool-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62060,14 +63141,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-unpool_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/x32-unpool/x32-unpool-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62091,14 +63172,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16") {
++  source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62119,14 +63203,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x64-transposec_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62150,17 +63237,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16") {
++  source_set("x64-transposec_sse2-no-sse3") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62181,17 +63266,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x64-transposec_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    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/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62215,18 +63298,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-dwconv_arch=armv8.2-a+fp16") {
++  source_set("x64-transposec_x64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62247,18 +63326,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x64-transposec_x64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62282,16 +63357,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-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/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-lut/gen/x8-lut-avx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62312,16 +63388,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-lut_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-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-lut/gen/x8-lut-avx-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62345,14 +63422,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16") {
++  source_set("x8-lut_f16c-fma-avx2") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
++      "src/src/x8-lut/gen/x8-lut-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62373,14 +63452,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-lut_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
++      "src/src/x8-lut/gen/x8-lut-avx2-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62404,14 +63485,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16") {
++  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
++      "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62432,14 +63519,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
++      "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62463,14 +63556,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
++  source_set("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vbmi",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
++      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62491,14 +63591,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vbmi",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
++      "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62522,14 +63629,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16") {
++  source_set("x8-lut_x64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62550,14 +63657,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-lut_x64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62581,17 +63688,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-gemm_arch=armv8.2-a+fp16") {
++  source_set("x8-packq_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/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62612,17 +63716,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-packq_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/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62646,21 +63747,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("x8-packw_x64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-gemm/gen/f16-gemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S"
++      "src/src/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" ]
@@ -62681,21 +63778,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-packw_x64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-gemm/gen/f16-gemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S"
++      "src/src/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" ]
@@ -62719,14 +63812,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-ibilinear-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-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
++      "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62747,14 +63842,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-transposec_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
++      "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62778,14 +63875,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-ibilinear_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-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
++      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62806,14 +63904,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-transposec_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
++      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62837,17 +63936,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16") {
++  source_set("x8-transposec_x64") {
 +    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/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62868,17 +63964,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-transposec_x64_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/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62902,21 +63995,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("xx-copy_x64") {
 +    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/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62937,21 +64023,75 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("xx-copy_x64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
 +
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("xx-fill_sse2-no-sse3") {
++    cflags = [
++      "-mno-sse3",
++    "-msse2"
++    ]
++  
 +    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/xx-fill/xx-fill-sse2-u64.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("xx-fill_sse2-no-sse3_standalone") {
++    cflags = [
++      "-mno-sse3",
++    "-msse2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-fill/xx-fill-sse2-u64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -62975,14 +64115,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_arch=armv8.2-a+fp16") {
++  source_set("xx-fill_x64") {
 +    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/xx-fill/xx-fill-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63003,14 +64143,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("xx-fill_x64_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/xx-fill/xx-fill-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63034,14 +64174,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_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-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
++      "src/src/xx-pad/xx-pad-p16-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63062,14 +64203,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("xx-pad_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
++      "src/src/xx-pad/xx-pad-p16-sse2-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63093,14 +64235,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_arm64") {
++  source_set("xx-pad_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63121,14 +64263,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("xx-pad_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63152,14 +64294,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_arm64") {
++  source_set("xx-transposev_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63180,14 +64322,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("xx-transposev_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63210,15 +64352,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  }
 +}
 +
++}
++
++if (current_cpu == "arm64") {
 +if (build_with_chromium) {
-+  source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16") {
++  source_set("bf16-f32-vcvt_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.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" ]
@@ -63239,14 +64385,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("bf16-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/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" ]
@@ -63270,15 +64417,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_arch=armv8.2-a+fp16") {
++  source_set("bf16-qs8-vcvt_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-neonfp16arith-u32.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-neonfp16arith-u32.c"
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63299,15 +64445,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("bf16-qs8-vcvt_arm64_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/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63331,15 +64476,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_arm64") {
++  source_set("bf16-rminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "src/src/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" ]
@@ -63360,15 +64509,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("bf16-rminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "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" ]
@@ -63392,16 +64545,37 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_arch=armv8.2-a+fp16") {
++  source_set("configs_arm64") {
 +    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/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" ]
@@ -63422,16 +64596,37 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("configs_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-neonfp16arith-u32-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-neonfp16arith-u32-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-neonfp16arith-u32-acc4.c"
++      "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" ]
@@ -63455,16 +64650,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_arm64") {
++  source_set("enums_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++      "src/src/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" ]
@@ -63485,16 +64682,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("enums_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++      "src/src/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" ]
@@ -63518,14 +64717,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-spmm_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-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
++      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63546,14 +64745,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-avgpool_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-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63577,14 +64776,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
++      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63605,14 +64804,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-conv-hwc2chw_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
++      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63636,14 +64835,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.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" ]
@@ -63664,14 +64866,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv2d-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-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" ]
@@ -63695,35 +64900,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_arch=armv8.2-a+fp16") {
++  source_set("f16-dwconv_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-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" ]
@@ -63744,35 +64932,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_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-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" ]
@@ -63796,14 +64967,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vclamp_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-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
++    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
++    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63824,14 +64997,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
++      "src/src/f16-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" ]
@@ -63855,14 +65030,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcmul_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-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63883,14 +65058,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63914,14 +65089,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcos_arch=armv8.2-a+fp16") {
++  source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63942,14 +65117,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32acc-rdsum_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-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -63973,14 +65148,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcos_arm64") {
++  source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64001,14 +65176,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32acc-rsum2_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-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64032,14 +65207,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-velu_arch=armv8.2-a+fp16") {
++  source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64060,14 +65235,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32acc-rsum_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64091,14 +65266,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vexp_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-vexp/gen/f16-vexp-neonfp16arith-poly-3.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" ]
@@ -64119,14 +65297,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c"
++      "src/src/f16-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" ]
@@ -64150,14 +65331,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vexp_arm64") {
++  source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.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" ]
@@ -64178,14 +65366,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.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" ]
@@ -64209,14 +65404,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_arch=armv8.2-a+fp16") {
++  source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c"
++      "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64237,73 +65432,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-ibilinear-chw_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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/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_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_arm64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64327,14 +65463,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vhswish_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-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
++      "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64355,14 +65491,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-ibilinear_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-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64386,14 +65522,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vlrelu_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-vlrelu/gen/f16-vlrelu-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" ]
@@ -64414,14 +65553,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-igemm_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-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" ]
@@ -64445,14 +65587,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vmulcaddc_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-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.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" ]
@@ -64473,14 +65622,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.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" ]
@@ -64504,17 +65660,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vrnd_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-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-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64535,17 +65688,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-maxpool_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-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64569,14 +65719,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vrsqrt_arch=armv8.2-a+fp16") {
++  source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64597,14 +65747,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qs8-vcvt_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-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64628,15 +65778,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsigmoid_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-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-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64657,15 +65806,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qs8-vcvt_arm64_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-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64689,14 +65837,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsin_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-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64717,14 +65865,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qu8-vcvt_arm64_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-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64748,14 +65896,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsin_arm64") {
++  source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64776,14 +65924,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-raddstoreexpminusmax_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -64807,15 +65955,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_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-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c",
-+    "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.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" ]
@@ -64836,15 +65984,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdminmax_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c",
-+    "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c"
++      "src/src/f16-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" ]
@@ -64868,15 +66016,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_arch=armv8.2-a+fp16") {
++  source_set("f16-rdminmax_arm64") {
 +    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-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" ]
@@ -64897,15 +66045,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdminmax_arm64_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-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" ]
@@ -64929,16 +66077,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vunary_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-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-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" ]
@@ -64959,16 +66107,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rminmax_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-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" ]
@@ -64992,15 +66140,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_arm64") {
++  source_set("f16-rminmax_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-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" ]
@@ -65021,15 +66170,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rminmax_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-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" ]
@@ -65053,15 +66203,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_arm64") {
++  source_set("f16-spmm_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-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65082,15 +66231,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-spmm_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-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65114,14 +66262,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16") {
++  source_set("f16-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65142,14 +66290,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65173,15 +66321,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_arm64") {
++  source_set("f16-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65202,15 +66349,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vapproxgelu_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-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65234,16 +66380,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_arm64") {
++  source_set("f16-vbinary_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-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" ]
@@ -65264,16 +66429,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vbinary_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-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" ]
@@ -65297,29 +66481,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_arm64") {
++  source_set("f16-vclamp_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-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65340,29 +66509,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vclamp_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-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65386,16 +66540,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-vcmul_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-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65416,16 +66568,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcmul_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-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65449,31 +66599,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_arm64") {
++  source_set("f16-vcos_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-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65494,31 +66627,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcos_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-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65542,16 +66658,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_arm64") {
++  source_set("f16-vcos_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neon-u8.c",
-+    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neonfp16-u16.c",
-+    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65572,16 +66686,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcos_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neon-u8.c",
-+    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-neonfp16-u16.c",
-+    "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65605,36 +66717,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-velu_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-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65655,36 +66745,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-velu_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-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65708,30 +66776,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-gemm_arm64") {
++  source_set("f16-vexp_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vexp/gen/f16-vexp-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65752,30 +66804,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vexp_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vexp/gen/f16-vexp-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65799,16 +66835,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_arm64") {
++  source_set("f16-vexp_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neon-p8.c",
-+    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neonfma-p8.c",
-+    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65829,16 +66863,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vexp_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neon-p8.c",
-+    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neonfma-p8.c",
-+    "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65862,16 +66894,73 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_arm64") {
++  source_set("f16-vgelu_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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=armv8.2-a+fp16_standalone") {
++    cflags = [
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vgelu/gen/f16-vgelu-neonfp16arith-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-vgelu_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65892,16 +66981,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vgelu_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-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65925,33 +67012,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-vhswish_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-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -65972,33 +67040,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vhswish_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-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66022,30 +67071,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-igemm_arm64") {
++  source_set("f16-vlog_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vlog/gen/f16-vlog-neonfp16arith-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66066,30 +67099,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlog_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vlog/gen/f16-vlog-neonfp16arith-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66113,15 +67130,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_arm64") {
++  source_set("f16-vlog_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-neon-u4.c",
-+    "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66142,15 +67158,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vlog_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/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66174,20 +67189,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_arm64") {
++  source_set("f16-vlrelu_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66208,20 +67217,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vlrelu_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66245,18 +67248,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-vmulcaddc_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-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/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66277,18 +67276,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vmulcaddc_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-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/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66312,19 +67307,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_arm64") {
++  source_set("f16-vrnd_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -66345,19 +67338,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vrnd_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -66381,17 +67372,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_arm64") {
++  source_set("f16-vrsqrt_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66412,17 +67400,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vrsqrt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66446,17 +67431,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-qu8-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-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/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" ]
@@ -66477,17 +67460,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vsigmoid_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -66511,15 +67492,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_arm64") {
++  source_set("f16-vsin_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66540,15 +67520,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vsin_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66572,17 +67551,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_arm64") {
++  source_set("f16-vsin_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/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66603,17 +67579,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vsin_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/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66637,15 +67610,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_arm64") {
++  source_set("f16-vsqrt_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -66666,15 +67639,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vsqrt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -66698,15 +67671,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_arm64") {
++  source_set("f16-vsqrt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-neon-u16.c",
-+    "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66727,15 +67699,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vsqrt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-neon-u16.c",
-+    "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66759,19 +67730,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_arm64") {
++  source_set("f16-vtanh_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
++    "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66792,19 +67759,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vtanh_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
++    "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66828,15 +67791,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_arm64") {
++  source_set("f16-vtanh_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/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66857,15 +67819,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vtanh_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/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66889,15 +67850,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-rsum_arm64") {
++  source_set("f16-vunary_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -66918,15 +67880,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vunary_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -66950,20 +67913,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-spmm_arm64") {
++  source_set("f32-argmaxpool_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c",
-+    "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c",
-+    "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c",
-+    "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
++    "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -66984,20 +67942,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-argmaxpool_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c",
-+    "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c",
-+    "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c",
-+    "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
++    "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67021,15 +67974,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_arm64") {
++  source_set("f32-avgpool_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-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" ]
@@ -67050,15 +68003,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-avgpool_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-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" ]
@@ -67082,51 +68035,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_arm64") {
++  source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+bf16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67147,51 +68063,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-bf16-vcvt_arch=armv8.2-a+bf16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+bf16"
 +    ]
 +  
 +    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-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67215,15 +68094,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_arm64") {
++  source_set("f32-bf16-vcvt_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-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" ]
@@ -67244,15 +68123,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-bf16-vcvt_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-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" ]
@@ -67276,15 +68155,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_arm64") {
++  source_set("f32-conv-hwc2chw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-neon-u8.c",
-+    "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-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" ]
@@ -67305,15 +68185,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-conv-hwc2chw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-neon-u8.c",
-+    "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-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" ]
@@ -67337,19 +68218,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_arm64") {
++  source_set("f32-dwconv2d-chw_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-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" ]
@@ -67370,19 +68261,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv2d-chw_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-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" ]
@@ -67406,15 +68307,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vcos_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-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-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67435,15 +68337,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-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-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -67467,17 +68370,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-velu_arm64") {
++  source_set("f32-dwconv_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-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" ]
@@ -67498,17 +68415,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_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-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" ]
@@ -67532,15 +68463,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vexp_arm64") {
++  source_set("f32-f16-vcvt_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-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" ]
@@ -67561,15 +68493,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-vcvt_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-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" ]
@@ -67593,15 +68526,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_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-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-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" ]
@@ -67622,15 +68576,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-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-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" ]
@@ -67654,15 +68629,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_arm64") {
++  source_set("f32-gemm_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-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" ]
@@ -67683,15 +68673,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_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-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" ]
@@ -67715,15 +68720,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlog_arm64") {
++  source_set("f32-ibilinear-chw_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-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" ]
@@ -67744,15 +68750,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-ibilinear-chw_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-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" ]
@@ -67776,15 +68783,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_arm64") {
++  source_set("f32-ibilinear_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-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" ]
@@ -67805,15 +68813,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-ibilinear_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-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" ]
@@ -67837,16 +68846,33 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_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-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-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" ]
@@ -67867,16 +68893,33 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-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-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" ]
@@ -67900,25 +68943,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_arm64") {
++  source_set("f32-igemm_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-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" ]
@@ -67939,25 +68987,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-igemm_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-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" ]
@@ -67981,16 +69034,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_arm64") {
++  source_set("f32-maxpool_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-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" ]
@@ -68011,16 +69063,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-maxpool_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-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" ]
@@ -68044,16 +69095,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_arm64") {
++  source_set("f32-qc4w-gemm_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-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" ]
@@ -68074,16 +69129,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_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-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" ]
@@ -68107,15 +69166,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsin_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-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-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" ]
@@ -68136,15 +69198,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-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-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" ]
@@ -68168,15 +69233,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_arm64") {
++  source_set("f32-qc8w-gemm_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-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" ]
@@ -68197,15 +69266,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-gemm_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-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" ]
@@ -68229,15 +69302,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_arm64") {
++  source_set("f32-qs8-vcvt_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-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" ]
@@ -68258,15 +69333,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qs8-vcvt_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-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" ]
@@ -68290,19 +69367,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-vunary_arm64") {
++  source_set("f32-qu8-vcvt_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-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" ]
@@ -68323,19 +69398,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qu8-vcvt_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-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" ]
@@ -68359,36 +69432,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("operators_arm64") {
++  source_set("f32-raddstoreexpminusmax_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-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" ]
@@ -68409,36 +69461,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-raddstoreexpminusmax_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-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" ]
@@ -68462,15 +69493,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-rdminmax_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-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" ]
@@ -68491,15 +69524,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdminmax_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-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" ]
@@ -68523,17 +69558,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-rdsum2_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-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" ]
@@ -68554,17 +69587,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum2_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-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" ]
@@ -68588,17 +69619,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf32-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-rdsum_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-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" ]
@@ -68619,17 +69648,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum_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-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" ]
@@ -68653,15 +69680,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pf32-igemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-rminmax_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-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" ]
@@ -68682,15 +69713,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rminmax_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-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" ]
@@ -68714,15 +69749,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-rsum2_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-rsum2/gen/f32-rsum2-neon.c",
++    "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68743,15 +69778,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum2_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-rsum2/gen/f32-rsum2-neon.c",
++    "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68775,16 +69810,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("f32-rsum_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-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" ]
@@ -68805,16 +69839,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_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-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" ]
@@ -68838,15 +69871,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qb4-packw_arch=armv8.2-a+dotprod") {
++  source_set("f32-spmm_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-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" ]
@@ -68867,15 +69905,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-spmm_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-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" ]
@@ -68899,15 +69942,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("f32-vapproxgelu_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-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" ]
@@ -68928,15 +69971,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vapproxgelu_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-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" ]
@@ -68960,15 +70003,51 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16") {
++  source_set("f32-vbinary_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-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" ]
@@ -68989,15 +70068,51 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vbinary_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-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" ]
@@ -69021,15 +70136,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-vclamp_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-vclamp/gen/f32-vclamp-neon.c",
++    "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69050,15 +70165,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vclamp_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-vclamp/gen/f32-vclamp-neon.c",
++    "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69082,16 +70197,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("f32-vcmul_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-vcmul/gen/f32-vcmul-neon-u8.c",
++    "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69112,16 +70226,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcmul_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-vcmul/gen/f32-vcmul-neon-u8.c",
++    "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69145,14 +70258,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_arm64") {
++  source_set("f32-vcopysign_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-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" ]
@@ -69173,14 +70291,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcopysign_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-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" ]
@@ -69204,15 +70327,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("f32-vcos_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"
++      "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" ]
@@ -69233,15 +70356,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
++  source_set("f32-vcos_arm64_standalone") {
 +    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"
++      "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" ]
@@ -69265,15 +70388,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16") {
++  source_set("f32-velu_arm64") {
 +    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-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" ]
@@ -69294,15 +70419,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-velu_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-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" ]
@@ -69326,15 +70453,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-vexp_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-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" ]
@@ -69355,15 +70482,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vexp_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-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" ]
@@ -69387,17 +70514,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("f32-vgelu_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/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" ]
@@ -69418,17 +70543,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vgelu_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/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" ]
@@ -69452,15 +70575,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16") {
++  source_set("f32-vhswish_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c2s4-minmax-neonfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-2x8c2s4-minmax-neonfp16arith.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-neon.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69481,15 +70604,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vhswish_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c2s4-minmax-neonfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-2x8c2s4-minmax-neonfp16arith.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-neon.c",
++    "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69513,17 +70636,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f32-vlog_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  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/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" ]
@@ -69544,17 +70665,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vlog_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  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/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" ]
@@ -69578,15 +70697,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-vlrelu_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-neon-u8.c",
++    "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69607,15 +70726,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vlrelu_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c8-minmax-neoni8mm.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-neon-u8.c",
++    "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69639,17 +70758,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16") {
++  source_set("f32-vmulcaddc_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x8c4-minmax-neondotfp16arith.c"
++      "src/src/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" ]
@@ -69670,17 +70788,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vmulcaddc_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-neondotfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x8c4-minmax-neondotfp16arith.c"
++      "src/src/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" ]
@@ -69704,15 +70821,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16") {
++  source_set("f32-vrnd_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c2s4-minmax-neonfp16arith-mlal.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-2x8c2s4-minmax-neonfp16arith-mlal.c"
++      "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" ]
@@ -69733,15 +70860,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vrnd_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c2s4-minmax-neonfp16arith-mlal.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-2x8c2s4-minmax-neonfp16arith-mlal.c"
++      "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" ]
@@ -69765,17 +70902,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f32-vrsqrt_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
++      "src/src/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" ]
@@ -69796,17 +70932,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vrsqrt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S"
++      "src/src/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" ]
@@ -69830,15 +70965,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_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-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/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" ]
@@ -69859,15 +70995,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsigmoid_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+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/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" ]
@@ -69891,15 +71028,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("f32-vsin_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    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/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" ]
@@ -69920,15 +71057,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsin_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    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/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" ]
@@ -69952,15 +71089,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("f32-vsqrt_arm64") {
 +    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/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" ]
@@ -69981,15 +71118,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vsqrt_arm64_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/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" ]
@@ -70013,17 +71150,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_arm64") {
++  source_set("f32-vtanh_arm64") {
 +    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/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" ]
@@ -70044,17 +71179,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vtanh_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/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" ]
@@ -70078,16 +71211,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("f32-vunary_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-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/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" ]
@@ -70108,16 +71244,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vunary_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++  
 +    ]
 +  
 +    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/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" ]
@@ -70141,14 +71280,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_arm64") {
++  source_set("operators_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/operators/argmax-pooling-nhwc.c",
++    "src/src/operators/average-pooling-nhwc.c",
++    "src/src/operators/batch-matrix-multiply-nc.c",
++    "src/src/operators/binary-elementwise-nd.c",
++    "src/src/operators/constant-pad-nd.c",
++    "src/src/operators/convolution-nchw.c",
++    "src/src/operators/convolution-nhwc.c",
++    "src/src/operators/deconvolution-nhwc.c",
++    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
++    "src/src/operators/fully-connected-nc.c",
++    "src/src/operators/max-pooling-nhwc.c",
++    "src/src/operators/pack-lh.c",
++    "src/src/operators/reduce-nd.c",
++    "src/src/operators/resize-bilinear-nchw.c",
++    "src/src/operators/resize-bilinear-nhwc.c",
++    "src/src/operators/rope-nthc.c",
++    "src/src/operators/slice-nd.c",
++    "src/src/operators/softmax-nc.c",
++    "src/src/operators/transpose-nd.c",
++    "src/src/operators/unary-elementwise-nc.c",
++    "src/src/operators/unpooling-nhwc.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -70169,14 +71330,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("operators_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/operators/argmax-pooling-nhwc.c",
++    "src/src/operators/average-pooling-nhwc.c",
++    "src/src/operators/batch-matrix-multiply-nc.c",
++    "src/src/operators/binary-elementwise-nd.c",
++    "src/src/operators/constant-pad-nd.c",
++    "src/src/operators/convolution-nchw.c",
++    "src/src/operators/convolution-nhwc.c",
++    "src/src/operators/deconvolution-nhwc.c",
++    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
++    "src/src/operators/fully-connected-nc.c",
++    "src/src/operators/max-pooling-nhwc.c",
++    "src/src/operators/pack-lh.c",
++    "src/src/operators/reduce-nd.c",
++    "src/src/operators/resize-bilinear-nchw.c",
++    "src/src/operators/resize-bilinear-nhwc.c",
++    "src/src/operators/rope-nthc.c",
++    "src/src/operators/slice-nd.c",
++    "src/src/operators/softmax-nc.c",
++    "src/src/operators/transpose-nd.c",
++    "src/src/operators/unary-elementwise-nc.c",
++    "src/src/operators/unpooling-nhwc.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -70200,15 +71383,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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/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" ]
@@ -70229,15 +71412,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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/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" ]
@@ -70261,15 +71444,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("pf16-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-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/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" ]
@@ -70290,15 +71475,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("pf16-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-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/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" ]
@@ -70322,17 +71509,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arm64") {
++  source_set("pf32-gemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    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/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" ]
@@ -70353,17 +71540,78 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("pf32-gemm_arch=armv8.2-a+sve+sve2_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("pf32-igemm_arch=armv8.2-a+sve+sve2") {
 +    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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("pf32-igemm_arch=armv8.2-a+sve+sve2_standalone") {
++    cflags = [
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    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/pf32-igemm/pf32-igemm-32x32-minmax-neonsme.c",
++    "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -70387,17 +71635,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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/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" ]
@@ -70418,17 +71664,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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/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" ]
@@ -70452,17 +71696,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_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-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/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" ]
@@ -70483,17 +71726,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("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/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/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" ]
@@ -70517,15 +71759,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qb4-packw_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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/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" ]
@@ -70546,15 +71788,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qb4-packw_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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/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" ]
@@ -70578,20 +71820,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arm64") {
++  source_set("qd8-f16-qb4w-gemm_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-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" ]
@@ -70612,20 +71849,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-gemm_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-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" ]
@@ -70649,17 +71881,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_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-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-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" ]
@@ -70680,17 +71910,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-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-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" ]
@@ -70714,17 +71942,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qd8-f16-qb4w-gemm_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/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-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" ]
@@ -70745,17 +71971,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-gemm_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/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-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" ]
@@ -70779,15 +72003,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-f16-qc2w-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-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-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" ]
@@ -70808,15 +72033,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc2w-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-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-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" ]
@@ -70840,22 +72066,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arm64") {
++  source_set("qd8-f16-qc2w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16-minmax-neon-mlal-lane-prfm.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8-minmax-neon-mlal-lane.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c2s4-minmax-neon-mlal.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-2x8c2s4-minmax-neon-mlal.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16-minmax-neon-mlal-lane-prfm.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8-minmax-neon-mlal-lane.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -70876,22 +72094,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc2w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16-minmax-neon-mlal-lane-prfm.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8-minmax-neon-mlal-lane.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c2s4-minmax-neon-mlal.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-2x8c2s4-minmax-neon-mlal.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16-minmax-neon-mlal-lane-prfm.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8-minmax-neon-mlal-lane.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -70915,16 +72125,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qb4w-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/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-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" ]
@@ -70945,16 +72154,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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/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-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" ]
@@ -70978,14 +72186,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.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" ]
@@ -71006,14 +72215,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc4w-gemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+i8mm+fp16"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.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" ]
@@ -71037,16 +72247,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-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/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-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" ]
@@ -71067,16 +72276,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc4w-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-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-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" ]
@@ -71100,14 +72308,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
++  source_set("qd8-f16-qc8w-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/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.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" ]
@@ -71128,14 +72339,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
++  source_set("qd8-f16-qc8w-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/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.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" ]
@@ -71159,15 +72373,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2") {
++  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -71188,15 +72402,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-gemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -71220,16 +72434,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    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-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" ]
@@ -71250,16 +72465,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -71283,14 +72499,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-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/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-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" ]
@@ -71311,79 +72528,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
-+    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme.c",
-+    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme2.c",
-+    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme.c",
-+    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme2.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
-+    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme.c",
-+    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme2.c",
-+    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme.c",
-+    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme2.c"
++      "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" ]
@@ -71407,20 +72560,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_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/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-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" ]
@@ -71441,20 +72591,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -71478,14 +72625,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16") {
++  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c"
++      "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" ]
@@ -71506,14 +72654,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-igemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.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" ]
@@ -71537,15 +72686,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_arm64") {
++  source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -71566,15 +72717,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-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-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c",
-+    "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.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" ]
@@ -71598,17 +72751,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-packw_arm64") {
++  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/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-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" ]
@@ -71629,17 +72780,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-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-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" ]
@@ -71663,15 +72812,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-8x8c4-minmax-fp32-neondot.c"
++      "src/src/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" ]
@@ -71692,15 +72841,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-8x8c4-minmax-fp32-neondot.c"
++      "src/src/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" ]
@@ -71724,17 +72873,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_arm64") {
++  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/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-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" ]
@@ -71755,17 +72902,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/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" ]
@@ -71789,17 +72934,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qd8-f32-qb4w-gemm_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -71820,17 +72965,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qb4w-gemm_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  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-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" ]
@@ -71854,15 +72999,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_arm64") {
++  source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/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" ]
@@ -71883,15 +73029,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/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" ]
@@ -71915,27 +73062,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_arm64") {
++  source_set("qd8-f32-qc2w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-neonv8-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-neon-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-neonv8-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neon-mla8-ld128.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld128.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-neon-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-neonv8-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71956,27 +73090,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc2w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-neonv8-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-neon-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-neonv8-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neon-mla8-ld128.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld128.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-neonv8-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-neon-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-neonv8-mla8-ld64.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72000,17 +73121,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-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/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/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" ]
@@ -72031,98 +73150,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
-+    ]
-+  
-+  asmflags = cflags
-+
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-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-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/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" ]
@@ -72146,15 +73182,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-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/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/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" ]
@@ -72175,15 +73211,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("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/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/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" ]
@@ -72207,20 +73243,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arm64") {
++  source_set("qd8-f32-qc4w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16-minmax-fp32-neonv8-mlal-lane.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/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" ]
@@ -72241,20 +73274,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc4w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16-minmax-fp32-neonv8-mlal-lane.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/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" ]
@@ -72278,17 +73308,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod") {
++  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-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/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" ]
@@ -72309,17 +73339,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-neondot.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c4-minmax-fp32-neondot.c"
++      "src/src/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" ]
@@ -72343,7 +73373,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16+dotprod"
 +    ]
@@ -72352,16 +73382,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +    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/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" ]
@@ -72382,7 +73404,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16+dotprod"
 +    ]
@@ -72391,16 +73413,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +    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/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" ]
@@ -72424,15 +73438,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
++  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-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/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" ]
@@ -72453,15 +73467,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("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-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/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" ]
@@ -72485,20 +73499,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arm64") {
++  source_set("qd8-f32-qc8w-gemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16-minmax-fp32-neonv8-mlal-lane.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/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" ]
@@ -72519,20 +73533,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-gemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16-minmax-fp32-neonv8-mlal-lane.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neon-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/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" ]
@@ -72556,14 +73570,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_arm64") {
++  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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.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" ]
@@ -72584,14 +73601,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.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" ]
@@ -72615,15 +73635,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_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-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/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" ]
@@ -72644,15 +73666,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("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-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/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" ]
@@ -72676,14 +73700,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_arch=armv8.2-a+dotprod") {
++  source_set("qd8-f32-qc8w-igemm_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-rsum/gen/qs8-rsum-neondot-u32-acc2.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72704,14 +73729,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-igemm_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-rsum/gen/qs8-rsum-neondot-u32-acc2.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-neoni8mm.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c8-minmax-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72735,15 +73761,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_arm64") {
++  source_set("qd8-f32-qc8w-igemm_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/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" ]
@@ -72764,15 +73797,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-igemm_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/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" ]
@@ -72796,17 +73836,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_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-vadd/gen/qs8-vadd-minmax-neon-ld64-u16.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u32.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
++      "src/src/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" ]
@@ -72827,17 +73866,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_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-vadd/gen/qs8-vadd-minmax-neon-ld64-u16.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-neon-ld64-u32.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
++      "src/src/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" ]
@@ -72861,17 +73899,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_arm64") {
++  source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72892,17 +73927,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-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/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72926,15 +73958,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_arm64") {
++  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
-+    "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x4c8s2-mstep4-aarch64-neondot.c",
++    "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
++    "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x8c16s2-aarch64-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72955,15 +73988,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
-+    "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/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" ]
@@ -72987,15 +74021,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_arm64") {
++  source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-neon-u32.c",
-+    "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73016,15 +74049,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("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-vlrelu/gen/qs8-vlrelu-neon-u32.c",
-+    "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73048,15 +74080,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_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-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
-+    "src/src/qs8-vmul/gen/qs8-vmul-minmax-rndnu-neon-ld64-u16.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-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73077,15 +74109,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("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/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/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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73109,15 +74141,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_arm64") {
++  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c",
-+    "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-rndnu-neon-ld64-u16.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" ]
@@ -73138,15 +74171,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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/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" ]
@@ -73170,14 +74204,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_arm64") {
++  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73198,14 +74232,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73229,14 +74263,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_arm64") {
++  source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme2.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73257,14 +74294,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qp8-f32-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x64c4-neonsme2.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme.c",
++    "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x64c4-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73288,14 +74328,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_arm64") {
++  source_set("qs8-dwconv_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.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" ]
@@ -73316,14 +74362,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.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" ]
@@ -73347,19 +74399,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_arm64") {
++  source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73380,19 +74427,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-vcvt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73416,15 +74458,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_arm64") {
++  source_set("qs8-f32-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
-+    "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-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" ]
@@ -73445,15 +74487,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
-+    "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-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" ]
@@ -73477,19 +74519,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qs8-packw_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-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" ]
@@ -73510,19 +74550,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-packw_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-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" ]
@@ -73546,90 +74584,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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_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"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/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_arch=armv8.2-a+fp16+dotprod") {
++  source_set("qs8-qc2w-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/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
++      "src/src/qs8-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" ]
@@ -73650,19 +74613,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("qs8-qc2w-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/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
++      "src/src/qs8-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" ]
@@ -73686,20 +74645,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_arm64") {
++  source_set("qs8-qc2w-gemm_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-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" ]
@@ -73720,20 +74676,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc2w-gemm_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-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" ]
@@ -73757,16 +74710,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_arm64") {
++  source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c",
-+    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
-+    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qs8-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" ]
@@ -73787,16 +74741,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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/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-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" ]
@@ -73820,15 +74775,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_arm64") {
++  source_set("qs8-qc4w-gemm_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-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" ]
@@ -73849,15 +74804,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_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-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" ]
@@ -73881,17 +74836,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_arm64") {
++  source_set("qs8-qc8w-dwconv_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-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" ]
@@ -73912,17 +74877,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-dwconv_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-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" ]
@@ -73946,17 +74921,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_arm64") {
++  source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -73977,17 +74952,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -74011,15 +74986,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_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/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
-+    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74040,15 +75025,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
-+    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74072,15 +75067,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_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/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
-+    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-neoni8mm.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x16c8-minmax-fp32-neoni8mm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74101,15 +75096,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    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-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" ]
@@ -74133,15 +75128,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_arm64") {
++  source_set("qs8-qc8w-gemm_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-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" ]
@@ -74162,15 +75162,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-gemm_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-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" ]
@@ -74194,15 +75199,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_arm64") {
++  source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -74223,15 +75230,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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-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" ]
@@ -74255,14 +75264,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_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-vprelu/gen/qu8-vprelu-scalar-u8.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" ]
@@ -74283,14 +75303,86 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c8-minmax-fp32-asm-aarch64-neon-mlal.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16-minmax-fp32-asm-aarch64-neon-mlal-lane-ld64.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-cortex-a55.S",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-asm-aarch64-neondot-ld128.S"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
++    cflags = [
++      "-march=armv8.2-a+i8mm+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.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" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74314,14 +75406,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_arm64") {
++  source_set("qs8-qc8w-igemm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16-minmax-fp32-neonv8-mlal-lane.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neon-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neon-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74342,14 +75440,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-igemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16-minmax-fp32-neonv8-mlal-lane.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neon-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neon-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74373,14 +75477,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_arm64") {
++  source_set("qs8-qu8-packw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74401,14 +75505,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qu8-packw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74432,16 +75536,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("reference_arm64") {
++  source_set("qs8-rdsum_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/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" ]
@@ -74462,16 +75565,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-rdsum_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/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" ]
@@ -74495,16 +75597,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_arm64") {
++  source_set("qs8-rsum_arch=armv8.2-a+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74525,16 +75625,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-rsum_arch=armv8.2-a+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+dotprod"
 +    ]
 +  
 +    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/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74558,15 +75656,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_arm64") {
++  source_set("qs8-rsum_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c",
-+    "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/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" ]
@@ -74587,15 +75685,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-rsum_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c",
-+    "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/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" ]
@@ -74619,17 +75717,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_arm64") {
++  source_set("qs8-vadd_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/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" ]
@@ -74650,17 +75748,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vadd_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/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" ]
@@ -74684,19 +75782,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_arm64") {
++  source_set("qs8-vaddc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/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" ]
@@ -74717,19 +75813,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vaddc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/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" ]
@@ -74753,15 +75847,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_arm64") {
++  source_set("qs8-vcvt_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/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
++    "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74782,15 +75876,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vcvt_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/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
++    "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74814,42 +75908,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("subgraph_arm64") {
++  source_set("qs8-vlrelu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/rope.c",
-+    "src/src/subgraph/softmax.c",
-+    "src/src/subgraph/space-to-depth-2d.c",
-+    "src/src/subgraph/static-constant-pad.c",
-+    "src/src/subgraph/static-reduce.c",
-+    "src/src/subgraph/static-resize-bilinear-2d.c",
-+    "src/src/subgraph/static-slice.c",
-+    "src/src/subgraph/static-transpose.c",
-+    "src/src/subgraph/subgraph-utils.c",
-+    "src/src/subgraph/unary.c",
-+    "src/src/subgraph/unpooling-2d.c",
-+    "src/src/subgraph/validation.c"
++      "src/src/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" ]
@@ -74870,42 +75937,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vlrelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/rope.c",
-+    "src/src/subgraph/softmax.c",
-+    "src/src/subgraph/space-to-depth-2d.c",
-+    "src/src/subgraph/static-constant-pad.c",
-+    "src/src/subgraph/static-reduce.c",
-+    "src/src/subgraph/static-resize-bilinear-2d.c",
-+    "src/src/subgraph/static-slice.c",
-+    "src/src/subgraph/static-transpose.c",
-+    "src/src/subgraph/subgraph-utils.c",
-+    "src/src/subgraph/unary.c",
-+    "src/src/subgraph/unpooling-2d.c",
-+    "src/src/subgraph/validation.c"
++      "src/src/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" ]
@@ -74929,22 +75969,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("tables_arm64") {
++  source_set("qs8-vmul_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/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" ]
@@ -74965,22 +75998,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vmul_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/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" ]
@@ -75004,16 +76030,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_arm64") {
++  source_set("qs8-vmulc_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/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" ]
@@ -75034,16 +76059,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vmulc_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/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" ]
@@ -75067,14 +76091,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-lut32norm_arm64") {
++  source_set("qs8-vprelu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75095,14 +76119,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vprelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75126,15 +76150,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_arm64") {
++  source_set("qs8-vpreluc_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/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75155,15 +76178,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vpreluc_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/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75187,17 +76209,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_arm64") {
++  source_set("qs8-vrpreluc_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/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75218,17 +76237,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vrpreluc_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/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75252,19 +76268,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_arm64") {
++  source_set("qu8-dwconv_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-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" ]
@@ -75285,19 +76301,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_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-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" ]
@@ -75321,15 +76337,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_arm64") {
++  source_set("qu8-f32-vcvt_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-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" ]
@@ -75350,15 +76366,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_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-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" ]
@@ -75382,17 +76398,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -75413,17 +76431,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/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-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" ]
@@ -75447,15 +76467,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-packw_arm64") {
++  source_set("qu8-gemm_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-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" ]
@@ -75476,15 +76501,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_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-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" ]
@@ -75508,15 +76538,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-transposec_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/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-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" ]
@@ -75537,15 +76571,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = 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-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" ]
@@ -75569,15 +76607,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_arm64") {
++  source_set("qu8-igemm_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/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" ]
@@ -75598,15 +76641,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-igemm_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/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" ]
@@ -75630,16 +76678,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x24-transposec_arm64") {
++  source_set("qu8-rdsum_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/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" ]
@@ -75660,16 +76708,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-rdsum_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/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" ]
@@ -75693,17 +76741,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("qu8-rsum_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/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" ]
@@ -75724,17 +76770,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-rsum_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/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" ]
@@ -75758,24 +76802,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-packw_arm64") {
++  source_set("qu8-vadd_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/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" ]
@@ -75796,24 +76833,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vadd_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/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" ]
@@ -75837,16 +76867,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-transposec_arm64") {
++  source_set("qu8-vaddc_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/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" ]
@@ -75867,16 +76898,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vaddc_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/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" ]
@@ -75900,15 +76932,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x32-unpool_arm64") {
++  source_set("qu8-vcvt_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/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
++    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75929,15 +76961,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vcvt_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/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
++    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75961,16 +76993,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x64-transposec_arm64") {
++  source_set("qu8-vlrelu_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/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" ]
@@ -75991,16 +77022,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vlrelu_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/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" ]
@@ -76024,15 +77054,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-lut_arm64") {
++  source_set("qu8-vmul_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/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" ]
@@ -76053,15 +77083,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vmul_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/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" ]
@@ -76085,17 +77115,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("qu8-vmulc_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/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" ]
@@ -76116,17 +77144,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vmulc_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/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" ]
@@ -76150,15 +77176,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-packq_arm64") {
++  source_set("qu8-vprelu_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/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76179,15 +77204,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vprelu_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/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76211,17 +77235,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-packw_arm64") {
++  source_set("qu8-vpreluc_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/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76242,17 +77263,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vpreluc_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/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76276,15 +77294,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("x8-transposec_arm64") {
++  source_set("qu8-vrpreluc_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/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76305,15 +77322,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vrpreluc_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/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76337,14 +77353,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-copy_arm64") {
++  source_set("reference_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76365,14 +77383,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("reference_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76396,15 +77416,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-fill_arm64") {
++  source_set("s8-ibilinear_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/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" ]
@@ -76425,15 +77446,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-ibilinear_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/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" ]
@@ -76457,15 +77479,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-pad_arm64") {
++  source_set("s8-maxpool_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p16-neon-u16.c",
-+    "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++      "src/src/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" ]
@@ -76486,15 +77508,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-maxpool_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/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" ]
@@ -76518,14 +77540,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("xx-transposev_arm64") {
++  source_set("s8-rdminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.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" ]
@@ -76546,14 +77571,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rdminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.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" ]
@@ -76576,18 +77604,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  }
 +}
 +
-+}
-+
-+if (current_cpu == "riscv64") {
 +if (build_with_chromium) {
-+  source_set("bf16-f32-vcvt_riscv64") {
++  source_set("s8-rminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.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" ]
@@ -76608,14 +77638,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.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" ]
@@ -76639,14 +77674,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("bf16-qs8-vcvt_riscv64") {
++  source_set("s8-vclamp_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.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" ]
@@ -76667,14 +77703,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.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" ]
@@ -76698,16 +77735,43 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("bf16-rminmax_riscv64") {
++  source_set("subgraph_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/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" ]
@@ -76728,16 +77792,43 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("subgraph_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/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" ]
@@ -76761,37 +77852,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("configs_riscv64") {
++  source_set("tables_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/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" ]
@@ -76812,37 +77888,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("tables_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/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" ]
@@ -76866,18 +77927,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("enums_riscv64") {
++  source_set("u8-ibilinear_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/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" ]
@@ -76898,18 +77957,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-ibilinear_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/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" ]
@@ -76933,15 +77990,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-avgpool_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("u8-lut32norm_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/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76962,15 +78018,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-lut32norm_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/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -76994,18 +78049,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("u8-maxpool_arm64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv/gen/f16-dwconv-25p8vc-minmax-rvvfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-3p8vc-minmax-rvvfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-4p8vc-minmax-rvvfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p8vc-minmax-rvvfp16arith.c"
++      "src/src/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" ]
@@ -77026,18 +78078,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-maxpool_arm64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv/gen/f16-dwconv-25p8vc-minmax-rvvfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-3p8vc-minmax-rvvfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-4p8vc-minmax-rvvfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p8vc-minmax-rvvfp16arith.c"
++      "src/src/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" ]
@@ -77061,15 +78110,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("u8-rdminmax_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/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" ]
@@ -77090,15 +78141,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-rdminmax_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/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" ]
@@ -77122,14 +78175,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_riscv64") {
++  source_set("u8-rminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77150,14 +78208,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-rminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77181,15 +78244,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("u8-vclamp_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/u8-vclamp/u8-vclamp-neon-u64.c",
++    "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77210,15 +78273,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-vclamp_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/u8-vclamp/u8-vclamp-neon-u64.c",
++    "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77242,15 +78305,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("x16-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-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.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" ]
@@ -77271,15 +78336,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-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-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.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" ]
@@ -77303,15 +78370,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("x16-packw_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/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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77332,15 +78399,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-packw_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/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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77364,15 +78431,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("x16-transposec_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/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" ]
@@ -77393,15 +78460,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-transposec_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/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" ]
@@ -77425,16 +78492,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("x16-x32-packw_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/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" ]
@@ -77455,16 +78521,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-x32-packw_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/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" ]
@@ -77488,16 +78553,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("x24-transposec_arm64") {
 +    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/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" ]
@@ -77518,16 +78583,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x24-transposec_arm64_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/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" ]
@@ -77551,15 +78616,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("x32-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-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.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" ]
@@ -77580,15 +78647,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-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-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.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" ]
@@ -77612,14 +78681,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_riscv64") {
++  source_set("x32-packw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-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" ]
@@ -77640,14 +78719,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-packw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-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" ]
@@ -77671,14 +78760,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_riscv64") {
++  source_set("x32-transposec_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.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" ]
@@ -77699,67 +78790,3665 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-transposec_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vmulc_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vmulc_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x32-unpool_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-unpool/x32-unpool-neon.c",
++    "src/src/x32-unpool/x32-unpool-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("x32-unpool_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x32-unpool/x32-unpool-neon.c",
++    "src/src/x32-unpool/x32-unpool-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("x64-transposec_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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("x64-transposec_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x8-lut_arm64") {
++    cflags = [
++  
++    ]
++  
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x8-lut_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") {
++    cflags = [
++      "-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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x8-packq_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
++    "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x8-packq_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
++    "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x8-packw_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x8-packw_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("x8-transposec_arm64") {
++    cflags = [
++  
++    ]
++  
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x8-transposec_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("xx-copy_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("xx-copy_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("xx-fill_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-fill/xx-fill-neon-u64.c",
++    "src/src/xx-fill/xx-fill-scalar-u16.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-fill_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-fill/xx-fill-neon-u64.c",
++    "src/src/xx-fill/xx-fill-scalar-u16.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("xx-pad_arm64") {
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("xx-pad_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("xx-transposev_arm64") {
++    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_arm64_standalone") {
++    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: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") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("bf16-f32-vcvt_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "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_riscv64") {
++    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" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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_riscv64_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" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("bf16-rminmax_riscv64") {
++    cflags = [
++  
++    ]
++  
++    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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("bf16-rminmax_riscv64_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" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("configs_riscv64") {
++    cflags = [
++  
++    ]
++  
++    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",
++    ]
++
++    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 = [
++  
++    ]
++  
++    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" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("enums_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/enums/allocation-type.c",
++    "src/src/enums/datatype-strings.c",
++    "src/src/enums/microkernel-type.c",
++    "src/src/enums/node-type.c",
++    "src/src/enums/operator-type.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    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("enums_riscv64_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-avgpool_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-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-avgpool_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-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-dwconv_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-dwconv/gen/f16-dwconv-25p8vc-minmax-rvvfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-3p8vc-minmax-rvvfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-4p8vc-minmax-rvvfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p8vc-minmax-rvvfp16arith.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-dwconv_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-dwconv/gen/f16-dwconv-25p8vc-minmax-rvvfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-3p8vc-minmax-rvvfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-4p8vc-minmax-rvvfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p8vc-minmax-rvvfp16arith.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-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"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/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-rdsum_arch=rv64gc_zvfh-abi=lp64d") {
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
++    "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d") {
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-igemm_arch=rv64gc_zvfh-abi=lp64d_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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-maxpool_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-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-maxpool_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-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-qs8-vcvt_riscv64") {
++    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" ]
++
++    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-qs8-vcvt_riscv64_standalone") {
++    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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-qu8-vcvt_riscv64") {
++    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"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d") {
++    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"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-rdminmax_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-rvvfp16arith-u8v.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-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-rdminmax_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-rdminmax_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-rminmax/gen/f16-rmax-rvvfp16arith-u8v.c",
++    "src/src/f16-rminmax/gen/f16-rmin-rvvfp16arith-u8v.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-rvvfp16arith-u8v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-rminmax/gen/f16-rmax-rvvfp16arith-u8v.c",
++    "src/src/f16-rminmax/gen/f16-rmin-rvvfp16arith-u8v.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-rvvfp16arith-u8v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool: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_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-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-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-u2v.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-vapproxgelu_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vapproxgelu/gen/f16-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-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" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-vgelu_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vgelu_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d") {
++    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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# 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") {
++    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:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-gemm_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse41-ld64.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-gemm_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-vlog_riscv64") {
++    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" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-gemm_x64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vlog_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-2x4c8-minmax-fp32-avx-ld128.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-2x4c8-minmax-fp32-avx-ld128.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-igemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x8c8-minmax-fp32-avx2.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x8c8-minmax-fp32-avx2.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++if (build_with_chromium) {
++  source_set("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"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-igemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x8c8-minmax-fp32-avx2.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x8c8-minmax-fp32-avx2.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-7x16c8-minmax-fp32-avx512skx-prfm.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-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"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-7x16c8-minmax-fp32-avx512skx-prfm.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-igemm_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-ld64.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-igemm_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-ld64.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++if (build_with_chromium) {
++  source_set("f16-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"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-igemm_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse41-ld64.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-igemm_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse41-ld64.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-igemm_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-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"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-igemm_x64_standalone") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77779,22 +82468,33 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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"
++    ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-vmulc_sse4.1-no-sse4.2") {
+-    source_set("qu8-rdsum_ssse3-no-sse4.1") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mno-sse4.1",
+-        "-mssse3",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c",
+-        "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77808,37 +82508,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      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-vmulc_sse4.1-no-sse4.2_standalone") {
+-    source_set("qu8-rdsum_ssse3-no-sse4.1_standalone") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mno-sse4.1",
+-        "-mssse3",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c",
+-        "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77859,23 +82554,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vmulc_x64") {
+-    source_set("qu8-rdsum_x64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -77883,12 +82571,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c"
++      "src/src/f16-vrnd/gen/f16-vrndd-rvvfp16arith-u8v.c",
++    "src/src/f16-vrnd/gen/f16-vrndne-rvvfp16arith-u8v.c",
++    "src/src/f16-vrnd/gen/f16-vrndu-rvvfp16arith-u8v.c",
++    "src/src/f16-vrnd/gen/f16-vrndz-rvvfp16arith-u8v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c",
+-        "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -77923,12 +82614,98 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-rdsum_x64_standalone") {
 -      cflags = []
++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"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-rsum_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c",
+-        "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-rsum_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77950,8 +82727,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d") {
++# 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"
@@ -77959,21 +82737,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-vprelu_f16c-fma-avx2") {
+-    source_set("qu8-rsum_sse2-no-sse3") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c",
+-        "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77999,21 +82775,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vprelu_f16c-fma-avx2_standalone") {
+-    source_set("qu8-rsum_sse2-no-sse3_standalone") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-u16.c",
+-        "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78033,17 +82808,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
 +    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-vprelu_x64") {
+-    source_set("qu8-rsum_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-
+-      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",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -78051,23 +82845,135 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-rsum_x64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c",
+-        "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
++# 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-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c",
+-      ]
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -78075,6 +82981,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("qu8-vadd_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -78092,12 +83016,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vprelu_x64_standalone") {
--      cflags = []
+-    source_set("qu8-vadd_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78120,28 +83048,33 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_riscv64") {
++  source_set("f16-vsin_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-vsin/gen/f16-vsin-rvvfp16arith-rational-3-2-div-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-vpreluc_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/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78172,16 +83105,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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(
+-        "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/qs8-vpreluc/gen/qs8-vpreluc-avx2-u16.c",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78207,64 +83145,56 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-vpreluc_x64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
-+    ]
- 
+-    source_set("qu8-vadd_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-rational-3-2-div-u8v.c"
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vpreluc_x64_standalone") {
--      cflags = []
+-    source_set("qu8-vadd_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/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78286,31 +83216,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-rvvfp16arith-u8v.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-rvvfp16arith-u8v.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-rvvfp16arith-u8v.c"
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-vrpreluc_f16c-fma-avx2") {
+-    source_set("qu8-vadd_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/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78324,33 +83244,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vrpreluc_f16c-fma-avx2_standalone") {
+-    source_set("qu8-vadd_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/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78370,48 +83286,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-vrpreluc_x64") {
+-    source_set("qu8-vadd_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-vsin_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-rvvfp16arith-u8v.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-rvvfp16arith-u8v.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-rvvfp16arith-u8v.c"
++      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -78419,35 +83327,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vrpreluc_x64_standalone") {
+-    source_set("qu8-vadd_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f16-rminmax_riscv64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vsin_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-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-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.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" ]
@@ -78475,7 +83387,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma") {
+-    source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma") {
 -      cflags = [
 -        "-mavx",
 -        "-mno-avx2",
@@ -78485,8 +83397,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx-mul16.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx-mul16.c",
+-        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78504,18 +83415,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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) {
--    source_set("qu8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
+-    source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
 -      cflags = [
 -        "-mavx",
 -        "-mno-avx2",
@@ -78525,8 +83435,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx-mul16.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx-mul16.c",
+-        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78546,24 +83455,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-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"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("qu8-dwconv_f16c-fma-avx2") {
+-    source_set("qu8-vaddc_f16c-fma-avx2") {
 -      cflags = [
 -        "-mavx2",
 -        "-mf16c",
@@ -78572,8 +83471,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      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/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78587,24 +83485,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++if (build_with_chromium) {
++  source_set("f16-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"
++    ]
  
 -      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) {
--    source_set("qu8-dwconv_f16c-fma-avx2_standalone") {
+-    source_set("qu8-vaddc_f16c-fma-avx2_standalone") {
 -      cflags = [
 -        "-mavx2",
 -        "-mf16c",
@@ -78613,8 +83516,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      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/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78634,17 +83536,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    public_configs = [ ":xnnpack_public_config" ]
+-    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
 +
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set(
--        "qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-        "qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
 -        "-mavx512bw",
 -        "-mavx512cd",
@@ -78657,8 +83563,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      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/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78672,8 +83577,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d") {
++# 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"
@@ -78681,7 +83587,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -78695,7 +83601,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
+-        "qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
 -        "-mavx512bw",
 -        "-mavx512cd",
@@ -78708,8 +83614,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      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/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78730,19 +83635,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
--    source_set("qu8-dwconv_sse2-no-sse3") {
+-    source_set("qu8-vaddc_sse2-no-sse3") {
 -      cflags = [
 -        "-mno-sse3",
 -        "-msse2",
@@ -78750,8 +83652,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78765,30 +83666,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-dwconv_sse2-no-sse3_standalone") {
+-    source_set("qu8-vaddc_sse2-no-sse3_standalone") {
 -      cflags = [
 -        "-mno-sse3",
 -        "-msse2",
@@ -78796,8 +83685,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78819,15 +83707,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++if (build_with_chromium) {
++  source_set("f16-vsqrt_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-dwconv_sse4.1-no-sse4.2") {
+-    source_set("qu8-vaddc_sse4.1-no-sse4.2") {
 -      cflags = [
 -        "-mno-sse4.2",
 -        "-msse4.1",
@@ -78835,8 +83727,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78850,18 +83741,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-dwconv_sse4.1-no-sse4.2_standalone") {
+-    source_set("qu8-vaddc_sse4.1-no-sse4.2_standalone") {
 -      cflags = [
 -        "-mno-sse4.2",
 -        "-msse4.1",
@@ -78869,8 +83766,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78891,80 +83787,70 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_riscv64") {
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vaddc_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vsqrt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("qu8-dwconv_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",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool: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" ]
+     }
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-dwconv_x64_standalone") {
+-    source_set("qu8-vaddc_x64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c",
+-        "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" ]
@@ -78986,13 +83872,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_arch=rv64gc_zvfh-abi=lp64d") {
++    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"
++    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
+-    source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
 -      cflags = [
 -        "-mavx",
 -        "-mno-avx2",
@@ -79002,7 +83895,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79016,21 +83909,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
+-    source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 -      cflags = [
 -        "-mavx",
 -        "-mno-avx2",
@@ -79040,106 +83936,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("qu8-f32-vcvt_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+if (build_with_chromium) {
-+  source_set("f16-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"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-f32-vcvt_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-u16.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-avx-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79160,33 +83957,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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(
--        "qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-    source_set("qu8-vcvt_f16c-fma-avx2") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
+-        "-mavx2",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79202,7 +83987,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vtanh_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -79210,25 +83995,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vtanh/gen/f16-vtanh-rvvfp16arith-expm1minus-rr1-p3h2ts-div-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -79241,21 +84008,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vcvt_f16c-fma-avx2_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
+-        "-mavx2",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-u32.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79285,7 +84047,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-f32-vcvt_sse2-no-sse3") {
+-    source_set("qu8-vcvt_sse2-no-sse3") {
 -      cflags = [
 -        "-mno-sse3",
 -        "-msse2",
@@ -79293,7 +84055,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79318,7 +84080,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vcvt_sse2-no-sse3_standalone") {
 -      cflags = [
 -        "-mno-sse3",
 -        "-msse2",
@@ -79326,7 +84088,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse2-u32.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79349,19 +84111,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vtanh_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-f32-vcvt_sse4.1-no-sse4.2") {
+-    source_set("qu8-vcvt_sse4.1-no-sse4.2") {
 -      cflags = [
 -        "-mno-sse4.2",
 -        "-msse4.1",
@@ -79369,7 +84130,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79400,7 +84161,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vcvt_sse4.1-no-sse4.2_standalone") {
 -      cflags = [
 -        "-mno-sse4.2",
 -        "-msse4.1",
@@ -79408,7 +84169,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-sse41-u16.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79434,40 +84195,123 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-f32-vcvt_x64") {
--      cflags = []
+-    source_set("qu8-vcvt_ssse3-no-sse4.1") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vtanh_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "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("qu8-vcvt_ssse3-no-sse4.1_standalone") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c",
+-      ]
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vcvt_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d") {
++    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"
++    ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -79475,23 +84319,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-f32-vcvt_x64_standalone") {
+-    source_set("qu8-vcvt_x64_standalone") {
 -      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") {
++    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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79513,19 +84375,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+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" ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma") {
+-    source_set("qu8-vlrelu_avx-no-avx2-no-f16c-no-fma") {
 -      cflags = [
 -        "-mavx",
 -        "-mno-avx2",
@@ -79535,8 +84391,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-avx-ld128.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-2x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79550,24 +84405,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
+-    source_set("qu8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
 -      cflags = [
 -        "-mavx",
 -        "-mno-avx2",
@@ -79577,8 +84429,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-avx-ld128.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-2x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79598,13 +84449,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-gemm_f16c-fma-avx2") {
+-    source_set("qu8-vlrelu_f16c-fma-avx2") {
 -      cflags = [
 -        "-mavx2",
 -        "-mf16c",
@@ -79613,8 +84465,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x8c8-minmax-fp32-avx2.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-3x8c8-minmax-fp32-avx2.c",
+-        "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79628,16 +84479,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_riscv64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -79650,7 +84501,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-gemm_f16c-fma-avx2_standalone") {
+-    source_set("qu8-vlrelu_f16c-fma-avx2_standalone") {
 -      cflags = [
 -        "-mavx2",
 -        "-mf16c",
@@ -79659,8 +84510,93 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x8c8-minmax-fp32-avx2.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-3x8c8-minmax-fp32-avx2.c",
+-        "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    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-vlrelu_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-vlrelu_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79690,22 +84626,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
  
 -  if (build_with_chromium) {
--    source_set(
--        "qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-    source_set("qu8-vlrelu_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-gemm/gen/qu8-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-7x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79730,22 +84659,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set(
--        "qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-    source_set("qu8-vlrelu_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-gemm/gen/qu8-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-7x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79768,27 +84690,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vexp_riscv64") {
++  source_set("f32-argmaxpool_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-gemm_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/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79819,16 +84740,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-gemm_sse2-no-sse3_standalone") {
+-    source_set("qu8-vlrelu_ssse3-no-sse4.1_standalone") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mno-sse4.1",
+-        "-mssse3",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79854,61 +84774,74 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-gemm_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
+-    source_set("qu8-vlrelu_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-argmaxpool_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse41-ld64.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_riscv64_standalone") {
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-vlrelu_x64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-gemm_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse41-ld64.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -79928,50 +84861,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-gemm_x64") {
--      cflags = []
+-    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/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-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f16-vgelu_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
-+    ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -79993,24 +84908,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-gemm_x64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
-+    ]
- 
+-    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/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-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80032,24 +84940,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
++    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma") {
+-    source_set("qu8-vmul_sse2-no-sse3") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      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-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80063,6 +84976,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -80070,25 +84991,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
+-    source_set("qu8-vmul_sse2-no-sse3_standalone") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      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-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80108,6 +85021,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
      }
@@ -80115,17 +85030,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-igemm_f16c-fma-avx2") {
+-    source_set("qu8-vmul_sse4.1-no-sse4.2") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      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-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80140,15 +85053,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-avgpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -80161,17 +85073,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vmul_sse4.1-no-sse4.2_standalone") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      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-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80204,74 +85114,73 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set(
--        "qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
+-    source_set("qu8-vmul_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-avgpool_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++    ]
+ 
 -      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-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# 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") {
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && 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-vmul_x64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("f32-bf16-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set(
--        "qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-igemm/gen/qu8-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
--        "src/src/qu8-igemm/gen/qu8-igemm-7x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80293,24 +85202,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-igemm_sse2-no-sse3") {
+-    source_set("qu8-vmulc_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-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-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80324,27 +85232,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
 -  # 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-vmulc_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-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-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80366,29 +85279,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-bf16-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-igemm_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/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-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80414,21 +85326,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-igemm_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/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-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80448,72 +85359,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("qu8-igemm_x64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-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"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
--        "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-igemm_x64_standalone") {
--      cflags = []
+-  if (build_with_chromium) {
+-    source_set("qu8-vmulc_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
 -
 -      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-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80525,77 +85388,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
 +if (build_with_chromium) {
-+  source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c4v-minmax-rvvfp16arith-2x.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("qu8-rdsum_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-rdsum_ssse3-no-sse4.1_standalone") {
+-    source_set("qu8-vmulc_sse4.1-no-sse4.2_standalone") {
 -      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-u64.c",
+-        "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80616,29 +85441,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-rdsum_x64") {
+-    source_set("qu8-vmulc_x64") {
 -      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("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c4v-minmax-rvvfp16arith-2x.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c",
+-        "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -80673,101 +85505,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vmulc_x64_standalone") {
 -      cflags = []
-+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"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-rsum_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-rsum_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.c",
+-        "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80789,32 +85532,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
++if (build_with_chromium) {
++  source_set("f32-conv-hwc2chw_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/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-rsum_sse2-no-sse3") {
+-    source_set("qu8-vprelu_f16c-fma-avx2") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c",
+-        "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80840,20 +85579,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-rsum_sse2-no-sse3_standalone") {
+-    source_set("qu8-vprelu_f16c-fma-avx2_standalone") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.c",
+-        "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80873,68 +85613,69 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
    }
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-rsum_x64") {
+-    source_set("qu8-vprelu_x64") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-conv-hwc2chw_riscv64_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/qu8-rsum/gen/qu8-rsum-scalar-u4.c",
+-        "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f16-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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-rsum_x64_standalone") {
+-    source_set("qu8-vprelu_x64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c",
+-        "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80955,22 +85696,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++if (build_with_chromium) {
++  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
++    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma") {
+-    source_set("qu8-vpreluc_f16c-fma-avx2") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c",
+-        "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80984,40 +85734,33 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-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"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") {
+-    source_set("qu8-vpreluc_f16c-fma-avx2_standalone") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-u8.c",
+-        "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81038,32 +85781,47 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vadd_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
+-    source_set("qu8-vpreluc_x64") {
+-      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") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c",
+-        "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -81081,16 +85839,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
+-    source_set("qu8-vpreluc_x64_standalone") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-u16.c",
+-        "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81113,32 +85867,34 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsin_riscv64") {
++  source_set("f32-dwconv2d-chw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.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) {
--    source_set(
--        "qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-    source_set("qu8-vrpreluc_f16c-fma-avx2") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
+-        "-mavx2",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c",
+-        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81169,21 +85925,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vrpreluc_f16c-fma-avx2_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
+-        "-mavx2",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-u16.c",
+-        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81209,104 +85960,51 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vadd_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
+-    source_set("qu8-vrpreluc_x64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c",
+-        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_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-vsin_riscv64_standalone") {
++  source_set("f32-dwconv2d-chw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.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"
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vadd_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("qu8-vadd_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -81314,22 +86012,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vadd_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
+-    source_set("qu8-vrpreluc_x64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-u8.c",
+-        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81356,24 +86047,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vadd_x64") {
+-    source_set("reference_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/reference/binary-elementwise.cc",
+-        "src/src/reference/packing.cc",
+-        "src/src/reference/unary-elementwise.cc",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81406,25 +86105,33 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("reference_x64_standalone") {
 -      cflags = []
 +# 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("f32-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.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 = [
 -        "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/reference/binary-elementwise.cc",
+-        "src/src/reference/packing.cc",
+-        "src/src/reference/unary-elementwise.cc",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81452,17 +86159,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma") {
+-    source_set("s8-ibilinear_sse2-no-sse3") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c",
+-        "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81490,17 +86195,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-ibilinear_sse2-no-sse3_standalone") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-u8.c",
+-        "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81527,16 +86230,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vaddc_f16c-fma-avx2") {
+-    source_set("s8-ibilinear_sse4.1-no-sse4.2") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c",
+-        "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81551,112 +86253,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-dwconv_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"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vaddc_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
-+    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-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+# 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") {
-+    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-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" ]
@@ -81669,21 +86282,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-ibilinear_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-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-u16.c",
+-        "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81704,31 +86311,61 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vaddc_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
+-    source_set("s8-ibilinear_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-dwconv_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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c",
+-        "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -81746,15 +86383,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
+-    source_set("s8-ibilinear_x64_standalone") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-u8.c",
+-        "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81777,19 +86411,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_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-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vaddc_sse4.1-no-sse4.2") {
+-    source_set("s8-maxpool_sse4.1-no-sse4.2") {
 -      cflags = [
 -        "-mno-sse4.2",
 -        "-msse4.1",
@@ -81797,7 +86431,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c",
+-        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81828,7 +86462,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-maxpool_sse4.1-no-sse4.2_standalone") {
 -      cflags = [
 -        "-mno-sse4.2",
 -        "-msse4.1",
@@ -81836,7 +86470,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-u8.c",
+-        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81862,25 +86496,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vaddc_x64") {
+-    source_set("s8-maxpool_x64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gcv"
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c",
+-        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -81915,13 +86548,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-maxpool_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/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81944,28 +86576,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_riscv64") {
++  source_set("f32-f16-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
+-    source_set("s8-rdminmax_sse4.1-no-sse4.2") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-avx-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" ]
@@ -81996,17 +86627,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rdminmax_sse4.1-no-sse4.2_standalone") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-avx-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" ]
@@ -82032,82 +86662,34 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vcvt_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-    source_set("s8-rdminmax_x64") {
+-      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-f16-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      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",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vcvt_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-u32.c",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -82115,23 +86697,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  if (build_with_chromium) {
--    source_set("qu8-vcvt_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -82149,15 +86714,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
+-    source_set("s8-rdminmax_x64_standalone") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-sse2-u32.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" ]
@@ -82180,7 +86743,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -82188,11 +86751,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vcvt_sse4.1-no-sse4.2") {
+-    source_set("s8-rminmax_sse4.1-no-sse4.2") {
 -      cflags = [
 -        "-mno-sse4.2",
 -        "-msse4.1",
@@ -82200,7 +86764,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.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" ]
@@ -82231,7 +86797,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rminmax_sse4.1-no-sse4.2_standalone") {
 -      cflags = [
 -        "-mno-sse4.2",
 -        "-msse4.1",
@@ -82239,7 +86805,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-u32.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" ]
@@ -82265,31 +86833,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vcvt_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-    source_set("s8-rminmax_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -82297,89 +86845,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      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",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vcvt_ssse3-no-sse4.1_standalone") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-ssse3-u32.c",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("qu8-vcvt_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f32-avgpool_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
-+    ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -82387,38 +86877,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
+     }
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vcvt_x64_standalone") {
+-    source_set("s8-rminmax_x64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c",
+-        "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
+-        "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
+-        "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -82440,88 +86917,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-vlrelu_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-avx-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++if (build_with_chromium) {
++  source_set("f32-gemm_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x4-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" ]
--    }
--  }
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--  # 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") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vlrelu_f16c-fma-avx2") {
+-    source_set("s8-vclamp_f16c-fma-avx2") {
 -      cflags = [
 -        "-mavx2",
 -        "-mf16c",
@@ -82530,7 +86943,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c",
+-        "src/src/s8-vclamp/s8-vclamp-avx2-u128.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -82544,28 +86957,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vlrelu_f16c-fma-avx2_standalone") {
+-    source_set("s8-vclamp_f16c-fma-avx2_standalone") {
 -      cflags = [
 -        "-mavx2",
 -        "-mf16c",
@@ -82574,7 +86983,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vlrelu/gen/qu8-vlrelu-avx2-u32.c",
+-        "src/src/s8-vclamp/s8-vclamp-avx2-u128.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -82595,27 +87004,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vlrelu_sse2-no-sse3") {
+-    source_set(
+-        "s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c",
+-        "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -82631,14 +87039,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.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" ]
@@ -82651,15 +87064,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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(
+-        "s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse2-u32.c",
+-        "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -82689,15 +87108,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vlrelu_sse4.1-no-sse4.2") {
+-    source_set("s8-vclamp_sse2-no-sse3") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c",
+-        "src/src/s8-vclamp/s8-vclamp-sse2-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -82722,15 +87141,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_sse2-no-sse3_standalone") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vlrelu/gen/qu8-vlrelu-sse41-u32.c",
+-        "src/src/s8-vclamp/s8-vclamp-sse2-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -82753,27 +87172,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-ibilinear-chw_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vlrelu_ssse3-no-sse4.1") {
+-    source_set("s8-vclamp_sse4.1-no-sse4.2") {
 -      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c",
+-        "src/src/s8-vclamp/s8-vclamp-sse41-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -82804,15 +87222,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_sse4.1-no-sse4.2_standalone") {
 -      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vlrelu/gen/qu8-vlrelu-ssse3-u32.c",
+-        "src/src/s8-vclamp/s8-vclamp-sse41-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -82838,24 +87256,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vlrelu_x64") {
+-    source_set("s8-vclamp_x64") {
 -      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-ibilinear-chw_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c",
+-        "src/src/s8-vclamp/s8-vclamp-scalar-u4.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -82890,22 +87307,158 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_x64_standalone") {
 -      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/s8-vclamp/s8-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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_riscv64") {
++  source_set("f32-ibilinear_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("subgraph_x64") {
+-      cflags = []
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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("subgraph_x64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-ibilinear_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++    ]
+ 
+-      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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -82933,17 +87486,112 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vmul_avx-no-avx2-no-f16c-no-fma") {
+-    source_set("tables_x64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/tables/exp2-k-over-2048.c",
+-        "src/src/tables/exp2-k-over-64.c",
+-        "src/src/tables/exp2minus-k-over-16.c",
+-        "src/src/tables/exp2minus-k-over-2048.c",
+-        "src/src/tables/exp2minus-k-over-32.c",
+-        "src/src/tables/exp2minus-k-over-4.c",
+-        "src/src/tables/exp2minus-k-over-64.c",
+-        "src/src/tables/exp2minus-k-over-8.c",
+-        "src/src/tables/vlog.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("tables_x64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("f32-igemm_arch=rv64gcv-abi=lp64d") {
++    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"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/tables/exp2-k-over-2048.c",
+-        "src/src/tables/exp2-k-over-64.c",
+-        "src/src/tables/exp2minus-k-over-16.c",
+-        "src/src/tables/exp2minus-k-over-2048.c",
+-        "src/src/tables/exp2minus-k-over-32.c",
+-        "src/src/tables/exp2minus-k-over-4.c",
+-        "src/src/tables/exp2minus-k-over-64.c",
+-        "src/src/tables/exp2minus-k-over-8.c",
+-        "src/src/tables/vlog.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("u8-ibilinear_sse2-no-sse3") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c",
+-        "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -82972,17 +87620,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-ibilinear_sse2-no-sse3_standalone") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-avx-mul16-ld64-u16.c",
+-        "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -83006,26 +87652,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  }
 +# 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-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vmul_sse2-no-sse3") {
+-    source_set("u8-ibilinear_sse4.1-no-sse4.2") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c",
+-        "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -83056,15 +87704,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-ibilinear_sse4.1-no-sse4.2_standalone") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse2-mul16-ld64-u8.c",
+-        "src/src/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -83093,15 +87741,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vmul_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
+-    source_set("u8-ibilinear_x64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c",
+-        "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -83116,16 +87761,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-igemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
++      "src/src/f32-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" ]
@@ -83138,15 +87786,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
+-    source_set("u8-ibilinear_x64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-sse41-mul16-ld64-u16.c",
+-        "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -83167,37 +87818,33 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vmul_x64") {
+-    source_set("u8-lut32norm_x64") {
 -      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-igemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
+-        "src/src/u8-lut32norm/u8-lut32norm-scalar.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -83225,113 +87872,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && 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-vmul_x64_standalone") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
-+    "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 = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-vmulc_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  # 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") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
+-    source_set("u8-lut32norm_x64_standalone") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-avx-mul16-ld64-u16.c",
+-        "src/src/u8-lut32norm/u8-lut32norm-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -83353,27 +87906,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_riscv64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vmulc_sse2-no-sse3") {
+-    source_set("u8-maxpool_sse2-no-sse3") {
 -      cflags = [
 -        "-mno-sse3",
 -        "-msse2",
@@ -83381,7 +87927,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c",
+-        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -83407,12 +87953,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vmulc_sse2-no-sse3_standalone") {
+-    source_set("u8-maxpool_sse2-no-sse3_standalone") {
 -      cflags = [
 -        "-mno-sse3",
 -        "-msse2",
@@ -83420,95 +87966,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse2-mul16-ld64-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("qu8-vmulc_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//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-dwconv_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_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-vmulc_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-sse41-mul16-ld64-u16.c",
+-        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -83529,23 +87987,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vmulc_x64") {
+-    source_set("u8-maxpool_x64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -83553,19 +88004,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
+-        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -83600,12 +88044,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-maxpool_x64_standalone") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
+-        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -83628,36 +88072,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_riscv64") {
++  source_set("f32-maxpool_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-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vprelu_f16c-fma-avx2") {
+-    source_set("u8-rdminmax_sse2-no-sse3") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.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" ]
@@ -83688,16 +88123,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-rdminmax_sse2-no-sse3_standalone") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vprelu/gen/qu8-vprelu-avx2-u16.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" ]
@@ -83723,32 +88158,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vprelu_x64") {
+-    source_set("u8-rdminmax_x64") {
 -      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-maxpool_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-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c",
+-        "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
+-        "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -83783,12 +88210,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-rdminmax_x64_standalone") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.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" ]
@@ -83811,28 +88239,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-qc4w-gemm_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-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vpreluc_f16c-fma-avx2") {
+-    source_set("u8-rminmax_sse2-no-sse3") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c",
+-        "src/src/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" ]
@@ -83863,16 +88292,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-rminmax_sse2-no-sse3_standalone") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-u16.c",
+-        "src/src/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" ]
@@ -83898,24 +88328,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vpreluc_x64") {
+-    source_set("u8-rminmax_x64") {
 -      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-qc4w-gemm_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-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c",
+-        "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
+-        "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
+-        "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -83950,12 +88382,100 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("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",
+-        "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
+-        "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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("u8-vclamp_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c",
+-        "src/src/u8-vclamp/u8-vclamp-avx2-u128.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    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("u8-vclamp_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/u8-vclamp/u8-vclamp-avx2-u128.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -83977,28 +88497,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_riscv64") {
++# 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-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vrpreluc_f16c-fma-avx2") {
+-    source_set(
+-        "u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
--        "-mavx2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c",
+-        "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84024,21 +88551,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vrpreluc_f16c-fma-avx2_standalone") {
+-    source_set(
+-        "u8-vclamp_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-vrpreluc/gen/qu8-vrpreluc-avx2-u16.c",
+-        "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84058,50 +88590,128 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
 +    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vrpreluc_x64") {
--      cflags = []
+-    source_set("u8-vclamp_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c",
+-        "src/src/u8-vclamp/u8-vclamp-sse2-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" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_riscv64_standalone") {
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//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-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("u8-vclamp_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/u8-vclamp/u8-vclamp-sse2-u64.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//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("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") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.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" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -84109,15 +88719,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vrpreluc_x64_standalone") {
+-    source_set("u8-vclamp_x64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("f32-qs8-vcvt_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c",
+-        "src/src/u8-vclamp/u8-vclamp-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84137,44 +88772,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("reference_x64") {
--      cflags = []
+-    source_set("x16-packw_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/reference/binary-elementwise.cc",
--        "src/src/reference/packing.cc",
--        "src/src/reference/unary-elementwise.cc",
+-        "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
-+    ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -84196,27 +88818,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("reference_x64_standalone") {
--      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") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
-+    ]
- 
+-    source_set("x16-packw_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/reference/binary-elementwise.cc",
--        "src/src/reference/packing.cc",
--        "src/src/reference/unary-elementwise.cc",
+-        "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84238,21 +88849,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("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"
++    ]
  
 -  if (build_with_chromium) {
--    source_set("s8-ibilinear_sse2-no-sse3") {
+-    source_set("x16-transposec_f16c-fma-avx2") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c",
+-        "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84266,6 +88886,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -84273,22 +88901,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-ibilinear_sse2-no-sse3_standalone") {
+-    source_set("x16-transposec_f16c-fma-avx2_standalone") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-ibilinear/gen/s8-ibilinear-sse2-u8.c",
+-        "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84308,6 +88932,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
      }
@@ -84315,15 +88941,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("s8-ibilinear_sse4.1-no-sse4.2") {
+-    source_set("x16-transposec_sse2-no-sse3") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c",
+-        "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84338,19 +88964,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-gemm_riscv64") {
++  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -84363,15 +88985,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-transposec_sse2-no-sse3_standalone") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-ibilinear/gen/s8-ibilinear-sse41-u16.c",
+-        "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84404,28 +89026,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("s8-ibilinear_x64") {
+-    source_set("x16-transposec_x64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_riscv64_standalone") {
++  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c",
+-        "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -84460,12 +89078,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-transposec_x64_standalone") {
 -      cflags = []
--
++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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c",
+-        "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84487,27 +89116,113 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_riscv64") {
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("x16-x32-packw_x64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      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",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_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-qu8-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.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"
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("x16-x32-packw_x64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      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 (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
 -  if (build_with_chromium) {
--    source_set("s8-maxpool_sse4.1-no-sse4.2") {
+-    source_set("x24-transposec_ssse3-no-sse4.1") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mno-sse4.1",
+-        "-mssse3",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c",
+-        "src/src/x24-transposec/x24-transposec-4x4-ssse3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84521,32 +89236,37 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++if (build_with_chromium) {
++  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("s8-maxpool_sse4.1-no-sse4.2_standalone") {
+-    source_set("x24-transposec_ssse3-no-sse4.1_standalone") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mno-sse4.1",
+-        "-mssse3",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-sse41-u16.c",
+-        "src/src/x24-transposec/x24-transposec-4x4-ssse3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84567,28 +89287,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-maxpool_x64") {
+-    source_set("x24-transposec_x64") {
 -      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-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c",
+-        "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -84623,12 +89351,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x24-transposec_x64_standalone") {
 -      cflags = []
--
++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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c",
+-        "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84650,28 +89388,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-ibilinear_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("s8-rdminmax_sse4.1-no-sse4.2") {
+-    source_set("x32-packw_avx-no-avx2-no-f16c-no-fma") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-sse41-u32.c",
--        "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-sse41-u32.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" ]
@@ -84685,14 +89422,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -84700,18 +89429,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rdminmax_sse4.1-no-sse4.2_standalone") {
+-    source_set("x32-packw_avx-no-avx2-no-f16c-no-fma_standalone") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-sse41-u32.c",
--        "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-sse41-u32.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" ]
@@ -84732,39 +89472,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("s8-rdminmax_x64") {
--      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-raddstoreexpminusmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
--      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",
--      ]
+-  if (build_with_chromium) {
+-    source_set("x32-packw_avx512f") {
+-      cflags = [ "-mavx512f" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -84772,6 +89500,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -84789,13 +89531,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("s8-rdminmax_x64_standalone") {
--      cflags = []
--
+-    source_set("x32-packw_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
++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"
++    ]
+ 
 -      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/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" ]
@@ -84817,31 +89574,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-igemm_arch=rv64gcv-abi=lp64d") {
-+    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"
-+    ]
++    configs -= [ "//build/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("s8-rminmax_sse4.1-no-sse4.2") {
+-    source_set("x32-packw_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/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" ]
@@ -84855,14 +89603,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -84870,19 +89610,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rminmax_sse4.1-no-sse4.2_standalone") {
+-    source_set("x32-packw_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/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" ]
@@ -84903,16 +89648,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("s8-rminmax_x64") {
--      cflags = []
+-  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -84920,25 +89659,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
--      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",
--      ]
+-  if (build_with_chromium) {
+-    source_set("x32-packw_x64") {
+-      cflags = []
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -84946,6 +89678,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -84963,14 +89710,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-packw_x64_standalone") {
 -      cflags = []
--
++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"
++    ]
+ 
 -      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/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" ]
@@ -84992,33 +89753,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-igemm_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
-+    ]
++    configs -= [ "//build/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("s8-vclamp_f16c-fma-avx2") {
+-    source_set("x32-transposec_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/s8-vclamp/s8-vclamp-avx2-u128.c",
+-        "src/src/x32-transposec/gen/x32-transposec-8x8-reuse-multi-avx.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85032,14 +89783,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -85047,18 +89790,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_f16c-fma-avx2_standalone") {
+-    source_set("x32-transposec_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/s8-vclamp/s8-vclamp-avx2-u128.c",
+-        "src/src/x32-transposec/gen/x32-transposec-8x8-reuse-multi-avx.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85079,26 +89829,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-rdminmax_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"
++    ]
  
 -  if (build_with_chromium) {
--    source_set(
--        "s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-    source_set("x32-transposec_sse-no-sse2") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse2",
+-        "-msse",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.c",
+-        "src/src/x32-transposec/x32-transposec-4x4-sse.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85112,48 +89866,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-igemm_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_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(
--        "s8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-    source_set("x32-transposec_sse-no-sse2_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse2",
+-        "-msse",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-vclamp/s8-vclamp-avx512skx-u256.c",
+-        "src/src/x32-transposec/x32-transposec-4x4-sse.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85173,58 +89911,82 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("s8-vclamp_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
+-    source_set("x32-transposec_x64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-vclamp/s8-vclamp-sse2-u64.c",
+-        "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
 -      ]
--
++if (build_with_chromium) {
++  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-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" ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//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" ]
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("s8-vclamp_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
+-    source_set("x32-transposec_x64_standalone") {
+-      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") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-vclamp/s8-vclamp-sse2-u64.c",
+-        "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85246,28 +90008,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
-+    ]
++    configs -= [ "//build/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("s8-vclamp_sse4.1-no-sse4.2") {
+-    source_set("x32-unpool_sse2-no-sse3") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-vclamp/s8-vclamp-sse41-u64.c",
+-        "src/src/x32-unpool/x32-unpool-sse2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85281,32 +90036,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_sse4.1-no-sse4.2_standalone") {
+-    source_set("x32-unpool_sse2-no-sse3_standalone") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-vclamp/s8-vclamp-sse41-u64.c",
+-        "src/src/x32-unpool/x32-unpool-sse2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85326,46 +90078,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_x64") {
+-    source_set("x32-unpool_x64") {
 -      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") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/x32-unpool/x32-unpool-scalar.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-rdsum2_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/s8-vclamp/s8-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",
@@ -85373,23 +90118,38 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("s8-vclamp_x64_standalone") {
+-    source_set("x32-unpool_x64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-rdsum2_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-vclamp/s8-vclamp-scalar-u4.c",
+-        "src/src/x32-unpool/x32-unpool-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85411,56 +90171,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-maxpool_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
-+    ]
- 
--  if (build_with_chromium) {
--    source_set("subgraph_x64") {
--      cflags = []
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-  if (build_with_chromium) {
+-    source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/subgraph/argmax-pooling-2d.c",
--        "src/src/subgraph/average-pooling-2d.c",
--        "src/src/subgraph/batch-matrix-multiply.c",
--        "src/src/subgraph/binary.c",
--        "src/src/subgraph/concatenate.c",
--        "src/src/subgraph/convolution-2d.c",
--        "src/src/subgraph/copy.c",
--        "src/src/subgraph/deconvolution-2d.c",
--        "src/src/subgraph/deprecated.c",
--        "src/src/subgraph/depth-to-space-2d.c",
--        "src/src/subgraph/depthwise-convolution-2d.c",
--        "src/src/subgraph/even-split.c",
--        "src/src/subgraph/fully-connected-sparse.c",
--        "src/src/subgraph/fully-connected.c",
--        "src/src/subgraph/max-pooling-2d.c",
--        "src/src/subgraph/pack-lh.c",
--        "src/src/subgraph/reshape-helpers.c",
--        "src/src/subgraph/rope.c",
--        "src/src/subgraph/softmax.c",
--        "src/src/subgraph/space-to-depth-2d.c",
--        "src/src/subgraph/static-constant-pad.c",
--        "src/src/subgraph/static-reduce.c",
--        "src/src/subgraph/static-resize-bilinear-2d.c",
--        "src/src/subgraph/static-slice.c",
--        "src/src/subgraph/static-transpose.c",
--        "src/src/subgraph/subgraph-utils.c",
--        "src/src/subgraph/unary.c",
--        "src/src/subgraph/unpooling-2d.c",
--        "src/src/subgraph/validation.c",
+-        "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85478,62 +90205,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//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("subgraph_x64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/subgraph/argmax-pooling-2d.c",
--        "src/src/subgraph/average-pooling-2d.c",
--        "src/src/subgraph/batch-matrix-multiply.c",
--        "src/src/subgraph/binary.c",
--        "src/src/subgraph/concatenate.c",
--        "src/src/subgraph/convolution-2d.c",
--        "src/src/subgraph/copy.c",
--        "src/src/subgraph/deconvolution-2d.c",
--        "src/src/subgraph/deprecated.c",
--        "src/src/subgraph/depth-to-space-2d.c",
--        "src/src/subgraph/depthwise-convolution-2d.c",
--        "src/src/subgraph/even-split.c",
--        "src/src/subgraph/fully-connected-sparse.c",
--        "src/src/subgraph/fully-connected.c",
--        "src/src/subgraph/max-pooling-2d.c",
--        "src/src/subgraph/pack-lh.c",
--        "src/src/subgraph/reshape-helpers.c",
--        "src/src/subgraph/rope.c",
--        "src/src/subgraph/softmax.c",
--        "src/src/subgraph/space-to-depth-2d.c",
--        "src/src/subgraph/static-constant-pad.c",
--        "src/src/subgraph/static-reduce.c",
--        "src/src/subgraph/static-resize-bilinear-2d.c",
--        "src/src/subgraph/static-slice.c",
--        "src/src/subgraph/static-transpose.c",
--        "src/src/subgraph/subgraph-utils.c",
--        "src/src/subgraph/unary.c",
--        "src/src/subgraph/unpooling-2d.c",
--        "src/src/subgraph/validation.c",
++      "//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("x64-transposec_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85553,34 +90245,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("tables_x64") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-    source_set("x64-transposec_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
 -      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/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85594,42 +90274,37 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("tables_x64_standalone") {
--      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_riscv64") {
++  source_set("f32-rdsum_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-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("x64-transposec_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
 -      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/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85650,59 +90325,76 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-ibilinear_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
+-    source_set("x64-transposec_x64") {
+-      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") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c",
+-        "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool: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" ]
+     }
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("u8-ibilinear_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
+-    source_set("x64-transposec_x64_standalone") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-ibilinear/gen/u8-ibilinear-sse2-u8.c",
+-        "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85724,29 +90416,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc4w-gemm_riscv64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-rdsum_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("u8-ibilinear_sse4.1-no-sse4.2") {
+-    source_set("x8-lut_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/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c",
+-        "src/src/x8-lut/gen/x8-lut-avx-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85772,20 +90464,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-ibilinear_sse4.1-no-sse4.2_standalone") {
+-    source_set("x8-lut_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/u8-ibilinear/gen/u8-ibilinear-sse41-u16.c",
+-        "src/src/x8-lut/gen/x8-lut-avx-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85805,21 +90499,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-ibilinear_x64") {
--      cflags = []
+-    source_set("x8-lut_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c",
+-        "src/src/x8-lut/gen/x8-lut-avx2-u128.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85833,16 +90528,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_riscv64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-rdsum_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -85855,18 +90550,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("u8-ibilinear_x64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("x8-lut_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c",
+-        "src/src/x8-lut/gen/x8-lut-avx2-u128.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85887,46 +90580,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("u8-lut32norm_x64") {
--      cflags = []
-+# 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"
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  if (build_with_chromium) {
+-    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/u8-lut32norm/u8-lut32norm-scalar.c",
+-        "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-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",
@@ -85944,12 +90627,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("u8-lut32norm_x64_standalone") {
--      cflags = []
+-    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/u8-lut32norm/u8-lut32norm-scalar.c",
+-        "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85972,7 +90664,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -85980,19 +90672,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
++      "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c",
++    "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("u8-maxpool_sse2-no-sse3") {
+-    source_set(
+-        "x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vbmi",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c",
+-        "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86023,15 +90724,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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(
+-        "x8-lut_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vbmi_standalone") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vbmi",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-sse2-u16.c",
+-        "src/src/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86057,11 +90765,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("u8-maxpool_x64") {
+-    source_set("x8-lut_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") {
++  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -86069,12 +90777,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.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 = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c",
+-        "src/src/x8-lut/gen/x8-lut-scalar-u4.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -86109,12 +90819,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-lut_x64_standalone") {
 -      cflags = []
--
++if (build_with_chromium) {
++  source_set("f32-rminmax_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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c",
+-        "src/src/x8-lut/gen/x8-lut-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86136,29 +90858,77 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_riscv64") {
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("x8-packq_x64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-rminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-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"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("u8-rdminmax_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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("x8-packq_x64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      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/x8-packq/x8-packq-scalar-f32qp8-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86170,16 +90940,59 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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 (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("x8-packw_x64") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-rsum2/gen/f32-rsum2-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" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
+-        "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
+-        "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
+-        "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -86187,18 +91000,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("u8-rdminmax_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("x8-packw_x64_standalone") {
+-      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") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c"
++    ]
+ 
 -      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/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" ]
@@ -86219,71 +91049,60 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("u8-rdminmax_x64") {
--      cflags = []
-+# 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"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
--        "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c",
--      ]
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-  if (build_with_chromium) {
+-    source_set("x8-transposec_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c",
+-      ]
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("u8-rdminmax_x64_standalone") {
--      cflags = []
+-    source_set("x8-transposec_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
--        "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c",
+-        "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86303,22 +91122,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+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"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("u8-rminmax_sse2-no-sse3") {
+-    source_set("x8-transposec_sse2-no-sse3") {
 -      cflags = [
 -        "-mno-sse3",
 -        "-msse2",
@@ -86326,9 +91137,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      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/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86342,24 +91151,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++if (build_with_chromium) {
++  source_set("f32-rsum2_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("u8-rminmax_sse2-no-sse3_standalone") {
+-    source_set("x8-transposec_sse2-no-sse3_standalone") {
 -      cflags = [
 -        "-mno-sse3",
 -        "-msse2",
@@ -86367,9 +91180,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      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/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86390,31 +91201,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-rminmax_x64") {
+-    source_set("x8-transposec_x64") {
 -      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-rsum2_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -      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/x8-transposec/gen/x8-transposec-2x4-scalar-int.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -86449,25 +91264,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-transposec_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_riscv64") {
++  source_set("f32-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c"
 +    ]
  
 -      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/x8-transposec/gen/x8-transposec-2x4-scalar-int.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86495,29 +91308,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("u8-vclamp_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-vclamp/u8-vclamp-avx2-u128.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-    source_set("xx-copy_x64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -86525,81 +91317,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-vclamp/u8-vclamp-avx2-u128.c",
+-        "src/src/xx-copy/xx-copy-scalar-memcpy.c",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_riscv64_standalone") {
++  source_set("f32-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set(
--        "u8-vclamp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -86623,21 +91365,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
+-    source_set("xx-copy_x64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-vclamp/u8-vclamp-avx512skx-u256.c",
+-        "src/src/xx-copy/xx-copy-scalar-memcpy.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86657,8 +91391,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
      }
@@ -86666,7 +91398,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("u8-vclamp_sse2-no-sse3") {
+-    source_set("xx-fill_sse2-no-sse3") {
 -      cflags = [
 -        "-mno-sse3",
 -        "-msse2",
@@ -86674,7 +91406,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-vclamp/u8-vclamp-sse2-u64.c",
+-        "src/src/xx-fill/xx-fill-sse2-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86689,15 +91421,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rsum_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -86710,7 +91441,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("xx-fill_sse2-no-sse3_standalone") {
 -      cflags = [
 -        "-mno-sse3",
 -        "-msse2",
@@ -86718,7 +91449,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-vclamp/u8-vclamp-sse2-u64.c",
+-        "src/src/xx-fill/xx-fill-sse2-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86751,24 +91482,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("u8-vclamp_x64") {
+-    source_set("xx-fill_x64") {
 -      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-rsum_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-vclamp/u8-vclamp-scalar-u4.c",
+-        "src/src/xx-fill/xx-fill-scalar-u16.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -86803,22 +91533,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("xx-fill_x64_standalone") {
 -      cflags = []
-+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"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-vclamp/u8-vclamp-scalar-u4.c",
+-        "src/src/xx-fill/xx-fill-scalar-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86840,22 +91560,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-spmm_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c",
++    "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c",
++    "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c"
++    ]
  
 -  if (build_with_chromium) {
--    source_set("x16-packw_f16c-fma-avx2") {
+-    source_set("xx-pad_sse2-no-sse3") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c",
+-        "src/src/xx-pad/xx-pad-p16-sse2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86869,6 +91597,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -86876,24 +91612,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-packw_f16c-fma-avx2_standalone") {
+-    source_set("xx-pad_sse2-no-sse3_standalone") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c",
+-        "src/src/xx-pad/xx-pad-p16-sse2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86914,70 +91643,83 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("xx-pad_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_riscv64_standalone") {
++  source_set("f32-spmm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-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"
 +    ]
  
--  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/xx-pad/xx-pad-p4-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",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    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("x16-transposec_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
+-    source_set("xx-pad_x64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("f32-spmm_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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-transposec/gen/x16-transposec-16x16-reuse-switch-avx2.c",
+-        "src/src/xx-pad/xx-pad-p4-scalar-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -86997,39 +91739,81 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        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 (!(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("x16-transposec_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
+-    source_set("xx-transposev_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-spmm_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c",
+-        "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" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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-transposev_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vapproxgelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -87037,29 +91821,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("x16-transposec_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-multi-sse2.c",
+-        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -87080,6 +91847,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -87089,14 +91861,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +
 +    public_configs = [ ":xnnpack_public_config" ]
    }
-+}
+ }
  
+-if (current_cpu == "arm64") {
 -  if (build_with_chromium) {
--    source_set("x16-transposec_x64") {
+-    source_set("bf16-f32-vcvt_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vapproxgelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -87104,13 +91877,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -87145,23 +91918,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("bf16-f32-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_riscv64") {
++  source_set("f32-vapproxgelu_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-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.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" ]
@@ -87189,7 +91962,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("x16-x32-packw_x64") {
+-    source_set("bf16-qs8-vcvt_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -87200,8 +91973,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -87213,15 +91985,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_riscv64_standalone") {
++  source_set("f32-vapproxgelu_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-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      deps = [
@@ -87247,14 +92018,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("bf16-qs8-vcvt_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -87281,15 +92051,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("x24-transposec_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
+-    source_set("bf16-rminmax_arm64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x24-transposec/x24-transposec-4x4-ssse3.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" ]
@@ -87304,7 +92076,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -87312,7 +92084,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c"
++      "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -87325,15 +92115,167 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
+-    source_set("bf16-rminmax_arm64_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-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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/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_arm64") {
+-      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") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x24-transposec/x24-transposec-4x4-ssse3.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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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_arm64_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" ]
@@ -87353,37 +92295,151 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("enums_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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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_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"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 -    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("enums_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      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: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("x24-transposec_x64") {
--      cflags = []
+-    source_set("f16-avgpool_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vbinary_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c"
++      "src/src/f32-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/x24-transposec/gen/x24-transposec-1x2-scalar.c",
+-        "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -87418,22 +92474,114 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x24-transposec_x64_standalone") {
--      cflags = []
+-    source_set("f16-avgpool_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_riscv64") {
++  source_set("f32-vclamp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-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" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.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-conv-hwc2chw_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c",
+-        "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -87453,29 +92601,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-packw_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
+-    source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      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/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" ]
@@ -87489,36 +92630,42 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  source_set("f32-vclamp_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # 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") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
+-    source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      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/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" ]
@@ -87539,41 +92686,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-dwconv_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_riscv64_standalone") {
++  source_set("f32-vclamp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
-+    ]
- 
--  if (build_with_chromium) {
--    source_set("x32-packw_avx512f") {
--      cflags = [ "-mavx512f" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/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-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      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/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" ]
@@ -87587,38 +92725,34 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x32-packw_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
-+if (build_with_chromium) {
-+  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
-+    ]
+-    source_set("f16-dwconv_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/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/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" ]
@@ -87638,24 +92772,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-packw_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
+-    source_set("f16-f32-vcvt_arm64") {
+-      cflags = []
 -
 -      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/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" ]
@@ -87669,31 +92800,42 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x32-packw_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
+-    source_set("f16-f32-vcvt_arm64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/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/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" ]
@@ -87714,10 +92856,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -87725,45 +92873,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("x32-packw_x64") {
--      cflags = []
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      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",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//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",
 +    ]
-+
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -87775,27 +92913,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x32-packw_x64_standalone") {
--      cflags = []
+-    source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_riscv64") {
++  source_set("f32-vcmul_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      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/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -87823,30 +92956,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    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",
--      ]
+-    source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -87854,75 +92965,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-transposec_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x32-transposec/gen/x32-transposec-8x8-reuse-multi-avx.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-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:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_riscv64_standalone") {
++  source_set("f32-vcmul_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
--  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" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -87946,15 +93012,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [
--        "-mno-sse2",
--        "-msse",
--      ]
--
+-    source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x32-transposec/x32-transposec-4x4-sse.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -87974,8 +93038,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
      }
@@ -87983,62 +93045,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("x32-transposec_x64") {
--      cflags = []
+-    source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
+-        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c"
-+    ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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("x32-transposec_x64_standalone") {
--      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") {
++if (build_with_chromium) {
++  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -88046,33 +93073,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcopysign/gen/f32-vcopysign-rvv-u8v.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-rvv-u8v.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/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:pthreadpool_standalone",
--      ]
--
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 -    }
 -  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88080,52 +93086,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("x32-unpool_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/x32-unpool/x32-unpool-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",
--      ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    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("x32-unpool_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x32-unpool/x32-unpool-sse2.c",
+-        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88145,82 +93119,72 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-unpool_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/x32-unpool/x32-unpool-scalar.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f32-rminmax_riscv64") {
+-    source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-rvv-u8v.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-rvv-u8v.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c"
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/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" ]
+     }
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x32-unpool_x64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_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"
-+    ]
- 
+-    source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x32-unpool/x32-unpool-scalar.c",
+-        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88242,23 +93206,33 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
++if (build_with_chromium) {
++  source_set("f32-vcopysign_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-gemm_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.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" ]
@@ -88276,27 +93250,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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) {
--    source_set("x64-transposec_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
+-    source_set("f16-gemm_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x64-transposec/gen/x64-transposec-4x4-reuse-multi-avx.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" ]
@@ -88316,22 +93289,46 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcopysign_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"
++    ]
  
 -  if (build_with_chromium) {
--    source_set("x64-transposec_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
+-    source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      asmflags = cflags
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.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" ]
@@ -88345,8 +93342,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vcos_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -88354,28 +93364,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c"
++      "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("x64-transposec_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
+-      asmflags = cflags
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x64-transposec/gen/x64-transposec-2x2-multi-mov-sse2.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" ]
@@ -88396,23 +93408,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x64-transposec_x64") {
--      cflags = []
+-    source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vcos_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -88420,12 +93425,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c"
++      "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c",
+-        "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -88460,12 +93465,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x64-transposec_x64_standalone") {
--      cflags = []
--
+-    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") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c",
+-        "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88487,36 +93502,45 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-rsum2_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
-+    ]
++    configs -= [ "//build/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("x8-lut_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
+-    source_set("f16-ibilinear_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x8-lut/gen/x8-lut-avx-u64.c",
+-        "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vcos_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -88535,22 +93559,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x8-lut_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
+-    source_set("f16-ibilinear_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x8-lut/gen/x8-lut-avx-u64.c",
+-        "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88570,22 +93590,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-lut_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
+-    source_set("f16-igemm_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x8-lut/gen/x8-lut-avx2-u128.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" ]
@@ -88599,16 +93619,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum2_riscv64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-velu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -88621,16 +93641,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
+-    source_set("f16-igemm_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x8-lut/gen/x8-lut-avx2-u128.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" ]
@@ -88651,7 +93676,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-velu_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-velu/gen/f32-velu-rvv-rr2-p6-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" ]
+ 
+-      asmflags = cflags
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -88659,21 +93709,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  if (build_with_chromium) {
--    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/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.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" ]
@@ -88698,92 +93741,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/x8-lut/gen/x8-lut-avx512skx-vpshufb-u64.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
+-    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-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-velu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
- 
--  if (build_with_chromium) {
--    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/x8-lut/gen/x8-lut-avx512vbmi-vpermx2b-u128.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      asmflags = cflags
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -88791,24 +93767,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--  # 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") {
--      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/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" ]
@@ -88834,24 +93800,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("x8-lut_x64") {
--      cflags = []
+-    source_set("f16-maxpool_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-velu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x8-lut/gen/x8-lut-scalar-u4.c",
+-        "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -88886,22 +93851,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x8-lut_x64_standalone") {
--      cflags = []
+-    source_set("f16-maxpool_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum_riscv64") {
++  source_set("f32-vexp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x8-lut/gen/x8-lut-scalar-u4.c",
+-        "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88929,8 +93895,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("x8-packq_x64") {
--      cflags = []
+-    source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -88940,7 +93906,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c",
+-        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -88952,14 +93918,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_riscv64_standalone") {
++  source_set("f32-vexp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
 +    ]
  
 -      deps = [
@@ -88985,13 +93952,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x8-packq_x64_standalone") {
--      cflags = []
+-    source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c",
+-        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89018,28 +93985,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("x8-packw_x64") {
+-    source_set("f16-qs8-vcvt_arm64") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-spmm_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c"
-+    ]
- 
+-
 -      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/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89053,68 +94004,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("x8-packw_x64_standalone") {
--      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") {
++if (build_with_chromium) {
++  source_set("f32-vexp_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
--        "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
--        "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
--        "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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" ]
@@ -89122,134 +94023,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("x8-transposec_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-qs8-vcvt_arm64_standalone") {
+-      cflags = []
 +    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("x8-transposec_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/x8-transposec/gen/x8-transposec-32x32-reuse-switch-avx2.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("x8-transposec_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+if (build_with_chromium) {
-+  source_set("f32-spmm_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"
++      "//third_party/pthreadpool",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("x8-transposec_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-mov-sse2.c",
+-        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89270,37 +94057,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-transposec_x64") {
+-    source_set("f16-qu8-vcvt_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_riscv64_standalone") {
++  source_set("f32-vexp_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-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c",
+-        "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -89335,22 +94113,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-qu8-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_riscv64") {
++  source_set("f32-vgelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c",
+-        "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89378,8 +94157,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("xx-copy_x64") {
--      cflags = []
+-    source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -89389,7 +94168,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-copy/xx-copy-scalar-memcpy.c",
+-        "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -89401,14 +94180,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vgelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
 -      deps = [
@@ -89434,13 +94214,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("xx-copy_x64_standalone") {
--      cflags = []
+-    source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-copy/xx-copy-scalar-memcpy.c",
+-        "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89467,15 +94247,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("xx-fill_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
+-    source_set("f16-rdminmax_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-fill/xx-fill-sse2-u64.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" ]
@@ -89490,33 +94268,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vgelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    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-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -89529,15 +94288,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
+-    source_set("f16-rdminmax_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-fill/xx-fill-sse2-u64.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" ]
@@ -89558,54 +94321,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("xx-fill_x64") {
+-    source_set("f16-rdminmax_arm64") {
 -      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-vgelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    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-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-fill/xx-fill-scalar-u16.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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -89640,12 +94378,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-rdminmax_arm64_standalone") {
 -      cflags = []
--
++if (build_with_chromium) {
++  source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-fill/xx-fill-scalar-u16.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" ]
@@ -89667,45 +94417,114 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-vbinary_riscv64") {
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-rminmax_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-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",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vhswish_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-vhswish/gen/f32-vhswish-rvv-u4v.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_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-rminmax/gen/f16-rmax-neonfp16arith-u32-acc4.c",
+-        "src/src/f16-rminmax/gen/f16-rmin-neonfp16arith-u32-acc4.c",
+-        "src/src/f16-rminmax/gen/f16-rminmax-neonfp16arith-u32-acc4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool: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("xx-pad_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
+-    source_set("f16-rminmax_arm64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-pad/xx-pad-p16-sse2-u16.c",
+-        "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
+-        "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
+-        "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89719,14 +94538,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++if (build_with_chromium) {
++  source_set("f32-vhswish_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-rminmax_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -89734,17 +94568,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("xx-pad_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-pad/xx-pad-p16-sse2-u16.c",
+-        "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
+-        "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
+-        "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89770,41 +94598,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("xx-pad_x64") {
--      cflags = []
+-    source_set("f16-spmm_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_riscv64_standalone") {
++  source_set("f32-vhswish_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-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-pad/xx-pad-p4-scalar-u16.c",
+-        "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -89839,10 +94649,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("xx-pad_x64_standalone") {
--      cflags = []
+-    source_set("f16-spmm_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-vlog_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -89850,12 +94660,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c"
++      "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-pad/xx-pad-p4-scalar-u16.c",
+-        "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89876,28 +94686,37 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-vapproxgelu_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.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-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vlog_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -89905,22 +94724,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c"
++      "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.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",
@@ -89928,105 +94748,135 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vapproxgelu_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-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("xx-transposev_x64_standalone") {
+-  if (build_with_chromium) {
+-    source_set("f16-vapproxgelu_arm64") {
 -      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("f32-vclamp_riscv64") {
++  source_set("f32-vlog_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
  
--      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" ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
    }
- }
++}
  
--if (current_cpu == "arm64") {
--  if (build_with_chromium) {
--    source_set("bf16-f32-vcvt_arm64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vapproxgelu_arm64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_riscv64_standalone") {
++  source_set("f32-vlog_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.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/f16-vapproxgelu/gen/f16-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" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/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-vbinary_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -90034,6 +94884,37 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vbinary/gen/f16-vadd-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vaddc-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vdiv-aarch64-neonfp16arith-u8.c",
+-        "src/src/f16-vbinary/gen/f16-vdiv-fp16arith-u2.c",
+-        "src/src/f16-vbinary/gen/f16-vdivc-aarch64-neonfp16arith-u8.c",
+-        "src/src/f16-vbinary/gen/f16-vdivc-fp16arith-u2.c",
+-        "src/src/f16-vbinary/gen/f16-vmax-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vmaxc-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vmin-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vminc-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vmul-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vmulc-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vprelu-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vpreluc-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vrdivc-aarch64-neonfp16arith-u8.c",
+-        "src/src/f16-vbinary/gen/f16-vrdivc-fp16arith-u2.c",
+-        "src/src/f16-vbinary/gen/f16-vrpreluc-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vrsubc-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vsqrdiff-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vsqrdiffc-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vsub-neonfp16arith-u16.c",
+-        "src/src/f16-vbinary/gen/f16-vsubc-neonfp16arith-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -90051,10 +94932,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = []
+-    source_set("f16-vbinary_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -90062,13 +94943,33 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.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/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" ]
@@ -90096,8 +94997,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("bf16-qs8-vcvt_arm64") {
--      cflags = []
+-    source_set("f16-vclamp_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -90107,7 +95008,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -90119,7 +95020,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -90127,7 +95028,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -90153,13 +95054,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = []
+-    source_set("f16-vclamp_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    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/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90186,17 +95087,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("bf16-rminmax_arm64") {
--      cflags = []
+-    source_set("f16-vcmul_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      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/f16-vcmul/gen/f16-vcmul-neonfp16arith-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90211,14 +95107,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_riscv64") {
++  source_set("f32-vlrelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -90231,8 +95127,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("bf16-rminmax_arm64_standalone") {
--      cflags = []
+-    source_set("f16-vcmul_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -90242,12 +95138,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/f16-vcmul/gen/f16-vcmul-neonfp16arith-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90273,46 +95164,74 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("configs_arm64") {
--      cflags = []
+-    source_set("f16-vcos_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_riscv64_standalone") {
++  source_set("f32-vlrelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-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",
+-        "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-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",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vcos_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++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"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90324,6 +95243,60 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vcos_arm64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("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"
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90343,36 +95316,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vcos_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/configs/argmaxpool-config.c",
--        "src/src/configs/avgpool-config.c",
--        "src/src/configs/binary-elementwise-config.c",
--        "src/src/configs/cmul-config.c",
--        "src/src/configs/conv-hwc2chw-config.c",
--        "src/src/configs/dwconv-config.c",
--        "src/src/configs/dwconv2d-chw-config.c",
--        "src/src/configs/gemm-config.c",
--        "src/src/configs/hardware-config.c",
--        "src/src/configs/ibilinear-chw-config.c",
--        "src/src/configs/ibilinear-config.c",
--        "src/src/configs/lut32norm-config.c",
--        "src/src/configs/maxpool-config.c",
--        "src/src/configs/pack-lh-config.c",
--        "src/src/configs/raddstoreexpminusmax-config.c",
--        "src/src/configs/reduce-config.c",
--        "src/src/configs/spmm-config.c",
--        "src/src/configs/transpose-config.c",
--        "src/src/configs/unary-elementwise-config.c",
--        "src/src/configs/unpool-config.c",
--        "src/src/configs/vmulcaddc-config.c",
--        "src/src/configs/x8-lut-config.c",
--        "src/src/configs/xx-fill-config.c",
--        "src/src/configs/xx-pad-config.c",
+-        "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90399,16 +95349,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("enums_arm64") {
--      cflags = []
+-    source_set("f16-velu_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      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-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90423,17 +95369,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vmulcaddc_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-rvv-u8v.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-rvv-u8v.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -90446,8 +95389,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("enums_arm64_standalone") {
--      cflags = []
+-    source_set("f16-velu_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -90457,11 +95400,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90487,26 +95426,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-avgpool_arch=armv8.2-a+fp16") {
+-    source_set("f16-vexp_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vmulcaddc_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-rvv-u8v.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-rvv-u8v.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c",
+-        "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -90541,24 +95477,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vexp_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_riscv64") {
++  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++      "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-neonfp16arith.c",
+-        "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90586,8 +95524,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-vexp_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -90597,7 +95535,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c",
+-        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -90609,16 +95547,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_riscv64_standalone") {
++  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++      "src/src/f32-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 = [
@@ -90644,13 +95584,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-vexp_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c",
+-        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90677,15 +95617,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-dwconv2d-chw_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-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c",
+-        "src/src/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90700,15 +95637,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcos_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vrnd_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
++      "src/src/f32-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" ]
@@ -90721,7 +95660,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-vgelu_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -90732,10 +95671,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c",
+-        "src/src/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90761,11 +95697,64 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-dwconv_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-vgelu_arm64") {
+-      cflags = []
 +# 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-vrnd_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"
++    ]
+ 
+-      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",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vgelu_arm64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -90773,16 +95762,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c",
+-        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90794,6 +95779,60 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vhswish_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.c",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90813,17 +95852,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-dwconv_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-vhswish_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c",
+-        "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90850,14 +95885,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-f32-vcvt_arm64") {
--      cflags = []
+-    source_set("f16-vlog_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
+-        "src/src/f16-vlog/gen/f16-vlog-neonfp16arith-rational-3-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90872,14 +95905,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcos_riscv64") {
++  source_set("f32-vrsqrt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -90892,8 +95926,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = []
+-    source_set("f16-vlog_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -90903,9 +95937,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
+-        "src/src/f16-vlog/gen/f16-vlog-neonfp16arith-rational-3-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90931,23 +95963,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-vlog_arm64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcos_riscv64_standalone") {
++  source_set("f32-vrsqrt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c",
+-        "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" ]
@@ -90982,22 +96015,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-vlog_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-velu_riscv64") {
++  source_set("f32-vsigmoid_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c",
+-        "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -91025,7 +96059,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16") {
+-    source_set("f16-vlrelu_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -91036,7 +96070,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c",
+-        "src/src/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -91048,14 +96082,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_riscv64_standalone") {
++  source_set("f32-vsigmoid_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.c"
 +    ]
  
 -      deps = [
@@ -91081,13 +96116,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-vlrelu_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c",
+-        "src/src/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -91114,49 +96149,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
+-    source_set("f16-vmulcaddc_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vexp_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vsigmoid_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-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" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_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-rsum2_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -91164,9 +96189,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vmulcaddc_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vsigmoid_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c",
+-        "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -91187,39 +96234,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vexp_arch=rv64gcv-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c",
--      ]
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("f16-vrnd_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -91227,6 +96250,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vrnd/gen/f16-vrndd-neonfp16arith-u16.c",
+-        "src/src/f16-vrnd/gen/f16-vrndne-neonfp16arith-u16.c",
+-        "src/src/f16-vrnd/gen/f16-vrndu-neonfp16arith-u16.c",
+-        "src/src/f16-vrnd/gen/f16-vrndz-neonfp16arith-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -91244,12 +96280,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-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") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c",
+-        "src/src/f16-vrnd/gen/f16-vrndd-neonfp16arith-u16.c",
+-        "src/src/f16-vrnd/gen/f16-vrndne-neonfp16arith-u16.c",
+-        "src/src/f16-vrnd/gen/f16-vrndu-neonfp16arith-u16.c",
+-        "src/src/f16-vrnd/gen/f16-vrndz-neonfp16arith-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -91271,68 +96321,76 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-vexp_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
-+    ]
- 
--  if (build_with_chromium) {
--    source_set("f16-gemm_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-  if (build_with_chromium) {
+-    source_set("f16-vrsqrt_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-gemm/gen/f16-gemm-1x8-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-gemm/gen/f16-gemm-6x8-minmax-neonfp16arith-ld64.c",
+-        "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vsin_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.c"
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-gemm_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-vrsqrt_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-gemm/gen/f16-gemm-1x8-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-gemm/gen/f16-gemm-6x8-minmax-neonfp16arith-ld64.c",
+-        "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -91352,44 +96410,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vexp_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      asmflags = cflags
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-    source_set("f16-vsigmoid_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
--        "src/src/f16-gemm/gen/f16-gemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
+-        "src/src/f16-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" ]
@@ -91403,36 +96437,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_riscv64") {
++  source_set("f32-vsin_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vsin/gen/f32-vsin-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" ]
  
--      asmflags = cflags
+-  # 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") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -91442,12 +96469,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
--        "src/src/f16-gemm/gen/f16-gemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
+-        "src/src/f16-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" ]
@@ -91473,23 +96496,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16") {
+-    source_set("f16-vsin_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_riscv64_standalone") {
++  source_set("f32-vsin_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c",
+-        "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -91524,10 +96547,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-vsin_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91535,12 +96558,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c",
+-        "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -91568,8 +96591,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-ibilinear_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-vsin_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -91579,7 +96602,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c",
+-        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -91591,7 +96614,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsqrt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91599,7 +96622,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c"
 +    ]
  
 -      deps = [
@@ -91625,13 +96648,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-vsin_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c",
+-        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -91658,15 +96681,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-igemm_arch=armv8.2-a+fp16") {
+-    source_set("f16-vsqrt_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-igemm/gen/f16-igemm-1x16-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-igemm/gen/f16-igemm-1x8-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-igemm/gen/f16-igemm-6x16-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-igemm/gen/f16-igemm-6x8-minmax-neonfp16arith-ld64.c",
+-        "src/src/f16-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" ]
@@ -91681,14 +96702,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_riscv64") {
++  source_set("f32-vsqrt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -91701,7 +96722,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-igemm_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-vsqrt_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -91712,10 +96733,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-igemm/gen/f16-igemm-1x16-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-igemm/gen/f16-igemm-1x8-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-igemm/gen/f16-igemm-6x16-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-igemm/gen/f16-igemm-6x8-minmax-neonfp16arith-ld64.c",
+-        "src/src/f16-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" ]
@@ -91741,143 +96760,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-    source_set("f16-vsqrt_arm64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      asmflags = cflags
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-igemm/f16-igemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
--        "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" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_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-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
-+if (build_with_chromium) {
-+  source_set("f32-vlog_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vsqrt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c"
-+    ]
- 
--      asmflags = cflags
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/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" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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("f16-maxpool_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_arch=rv64gcv-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -91912,22 +96811,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-vsqrt_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vlog_riscv64") {
++  source_set("f32-vtanh_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -91955,7 +96855,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16") {
+-    source_set("f16-vtanh_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -91966,7 +96866,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -91978,14 +96879,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_riscv64_standalone") {
++  source_set("f32-vtanh_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
 +    ]
  
 -      deps = [
@@ -92011,13 +96913,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vtanh_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92044,12 +96947,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-qs8-vcvt_arm64") {
+-    source_set("f16-vtanh_arm64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92064,15 +96967,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vtanh_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -92085,7 +96987,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vtanh_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -92096,7 +96998,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92122,24 +97024,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-qu8-vcvt_arm64") {
--      cflags = []
+-    source_set("f16-vunary_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vtanh_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.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" ]
@@ -92174,22 +97077,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = []
+-    source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_riscv64") {
++  source_set("f32-vunary_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.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" ]
@@ -92217,8 +97125,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-argmaxpool_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -92228,7 +97136,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -92240,14 +97149,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_riscv64_standalone") {
++  source_set("f32-vunary_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-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 = [
@@ -92273,13 +97185,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-argmaxpool_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.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" ]
@@ -92306,13 +97219,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-rdminmax_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-avgpool_arm64") {
+-      cflags = []
 -
 -      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/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" ]
@@ -92327,15 +97240,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vunary_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
++      "src/src/f32-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" ]
@@ -92348,8 +97262,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-avgpool_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -92359,8 +97273,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -92386,25 +97300,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-rdminmax_arm64") {
--      cflags = []
+-    source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16") {
+-      cflags = [ "-march=armv8.2-a+bf16" ]
 +# 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-vunary_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
++      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
++    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
++    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
--        "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -92439,23 +97353,44 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-rdminmax_arm64_standalone") {
--      cflags = []
+-    source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16_standalone") {
+-      cflags = [ "-march=armv8.2-a+bf16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_riscv64") {
++  source_set("operators_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.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 = [
 -        "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/f32-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92483,8 +97418,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-rminmax_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-bf16-vcvt_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -92494,9 +97429,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/f32-bf16-vcvt/gen/f32-bf16-vcvt-neon-u8.c",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -92508,14 +97442,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vmulcaddc_riscv64_standalone") {
++  source_set("operators_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.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 = [
@@ -92541,15 +97497,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-bf16-vcvt_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -92576,14 +97531,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-rminmax_arm64") {
+-    source_set("f32-conv-hwc2chw_arm64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
--        "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
--        "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c",
+-        "src/src/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" ]
@@ -92598,18 +97553,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f16-qc2w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -92622,7 +97573,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-conv-hwc2chw_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -92633,9 +97584,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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/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" ]
@@ -92661,80 +97612,90 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-spmm_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-dwconv2d-chw_arm64") {
+-      cflags = []
 +# 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("qd8-f16-qc2w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.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" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-spmm_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
-+if (build_with_chromium) {
-+  source_set("f32-vrnd_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"
-+    ]
+-    source_set("f32-dwconv2d-chw_arm64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.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" ]
@@ -92754,16 +97715,38 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-dwconv_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") {
++    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"
++    ]
+ 
+-      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" ]
  
--  if (build_with_chromium) {
--    source_set("f16-vapproxgelu_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -92771,47 +97754,46 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-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" ]
++    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-vrnd_riscv64_standalone") {
++  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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/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 = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -92819,15 +97801,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-vapproxgelu_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-      asmflags = cflags
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c",
+-        "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92854,40 +97833,67 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vapproxgelu_arm64") {
+-    source_set("f32-dwconv_arm64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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-vrsqrt_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gcv"
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.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"
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      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("f32-dwconv_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -92895,32 +97901,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-vapproxgelu_arm64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
-+    ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.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" ]
@@ -92941,15 +97941,42 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-f16-vcvt_arm64") {
+-      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") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    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"
++    ]
+ 
+-      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",
+-      ]
 +    configs -= [ "//build/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-vbinary_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -92957,37 +97984,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vbinary/gen/f16-vadd-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vaddc-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vdiv-aarch64-neonfp16arith-u8.c",
--        "src/src/f16-vbinary/gen/f16-vdiv-fp16arith-u2.c",
--        "src/src/f16-vbinary/gen/f16-vdivc-aarch64-neonfp16arith-u8.c",
--        "src/src/f16-vbinary/gen/f16-vdivc-fp16arith-u2.c",
--        "src/src/f16-vbinary/gen/f16-vmax-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vmaxc-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vmin-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vminc-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vmul-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vmulc-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vprelu-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vpreluc-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vrdivc-aarch64-neonfp16arith-u8.c",
--        "src/src/f16-vbinary/gen/f16-vrdivc-fp16arith-u2.c",
--        "src/src/f16-vbinary/gen/f16-vrpreluc-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vrsubc-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vsqrdiff-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vsqrdiffc-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vsub-neonfp16arith-u16.c",
--        "src/src/f16-vbinary/gen/f16-vsubc-neonfp16arith-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -93005,44 +98001,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-f16-vcvt_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_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/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.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 = [
 -        "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/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" ]
@@ -93070,8 +98048,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vclamp_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -93079,45 +98057,73 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c",
--      ]
+-      asmflags = cflags
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
  
+-      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",
+-      ]
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//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-vrsqrt_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/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.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 = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -93125,15 +98131,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-vclamp_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-      asmflags = cflags
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.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" ]
@@ -93160,12 +98183,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vcmul_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-gemm_arm64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcmul/gen/f16-vcmul-neonfp16arith-u16.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" ]
@@ -93180,15 +98219,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qb4w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.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" ]
@@ -93201,8 +98240,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-gemm_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -93212,7 +98251,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcmul/gen/f16-vcmul-neonfp16arith-u16.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" ]
@@ -93238,24 +98293,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vcos_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-ibilinear-chw_arm64") {
+-      cflags = []
 +# 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("qd8-f32-qb4w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -93290,22 +98347,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-ibilinear-chw_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_riscv64") {
++  source_set("qd8-f32-qc2w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-rational-3-2-div.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" ]
@@ -93333,7 +98392,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vcos_arm64") {
+-    source_set("f32-ibilinear_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -93344,7 +98403,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.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",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -93356,14 +98417,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_riscv64_standalone") {
++  source_set("qd8-f32-qc2w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      deps = [
@@ -93389,13 +98450,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-ibilinear_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.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" ]
@@ -93422,27 +98485,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-velu_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//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("f32-igemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("f32-vsin_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93450,31 +98496,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.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" ]
--    }
--  }
+-      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" ]
  
--  # 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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.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" ]
@@ -93486,25 +98537,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 -    }
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("f16-vexp_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      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("f32-vsin_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93512,22 +98568,59 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("f32-igemm_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -93535,6 +98628,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -93552,22 +98671,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-igemm_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsin_riscv64") {
++  source_set("qd8-f32-qc4w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.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" ]
@@ -93595,7 +98731,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vexp_arm64") {
+-    source_set("f32-maxpool_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -93606,7 +98742,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.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",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -93618,14 +98755,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_riscv64_standalone") {
++  source_set("qd8-f32-qc4w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.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"
 +    ]
  
 -      deps = [
@@ -93651,13 +98789,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-maxpool_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.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" ]
@@ -93684,12 +98823,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vgelu_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-qc4w-gemm_arm64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.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" ]
@@ -93704,7 +98849,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93712,7 +98857,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.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" ]
@@ -93725,8 +98871,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-qc4w-gemm_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -93736,7 +98882,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.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" ]
@@ -93762,11 +98914,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vgelu_arm64") {
--      cflags = []
+-    source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-
+-      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93774,12 +98928,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -93814,22 +98971,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vgelu_arm64_standalone") {
--      cflags = []
+-    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("f32-vsqrt_riscv64") {
++  source_set("qd8-f32-qc8w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.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"
 +    ]
  
+-      asmflags = cflags
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.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" ]
@@ -93850,11 +99017,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -93867,33 +99029,51 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vhswish_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-qc8w-gemm_arm64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_riscv64_standalone") {
++  source_set("qd8-f32-qc8w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -93901,27 +99081,70 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-qc8w-gemm_arm64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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-vhswish_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-  if (build_with_chromium) {
+-    source_set("f32-qs8-vcvt_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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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-vtanh_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93929,12 +99152,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.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"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_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-qs8-vcvt_arm64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.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" ]
@@ -93955,37 +99201,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("f16-vlrelu_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-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" ]
+-  if (build_with_chromium) {
+-    source_set("f32-qu8-vcvt_arm64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93993,9 +99218,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -94019,13 +99258,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-qu8-vcvt_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.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" ]
@@ -94052,22 +99294,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vmulcaddc_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-raddstoreexpminusmax_arm64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.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",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_riscv64") {
++  source_set("qd8-f32-qc8w-igemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.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" ]
@@ -94100,23 +99345,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-raddstoreexpminusmax_arm64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_riscv64_standalone") {
++  source_set("qd8-f32-qc8w-igemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.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" ]
@@ -94144,8 +99392,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vrnd_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-rdminmax_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -94155,10 +99403,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -94183,10 +99431,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-rdminmax_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vunary_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94194,17 +99442,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/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/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" ]
@@ -94232,8 +99479,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vrsqrt_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-rdsum2_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -94243,7 +99490,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c",
+-        "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-neon.c",
+-        "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -94255,7 +99503,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94263,9 +99511,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -94291,13 +99538,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-rdsum2_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.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" ]
@@ -94324,51 +99572,43 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vsigmoid_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-rdsum_arm64") {
+-      cflags = []
 -
 -      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//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-rdsum/gen/f32-rdsum-7p7x-minmax-neon-u16.c",
+-        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vunary_riscv64") {
++  source_set("qs8-dwconv_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_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=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -94376,10 +99616,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-rdsum_arm64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-dwconv_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++    ]
+ 
 -      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/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" ]
@@ -94400,40 +99665,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f16-vsin_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c",
--      ]
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/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-rminmax_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -94441,6 +99681,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -94458,44 +99713,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vsin_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-rminmax_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("operators_riscv64") {
++  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.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" ]
@@ -94523,7 +99762,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vsin_arm64") {
+-    source_set("f32-rsum2_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -94534,7 +99773,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f32-rsum2/gen/f32-rsum2-neon.c",
+-        "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -94546,36 +99786,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -94601,13 +99820,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-rsum2_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f32-rsum2/gen/f32-rsum2-neon.c",
+-        "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94634,13 +99854,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vsqrt_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-rsum_arm64") {
+-      cflags = []
 -
 -      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/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" ]
@@ -94655,14 +99875,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc2w-gemm_riscv64") {
++  source_set("qs8-f32-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -94675,144 +99895,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-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" ]
--      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f16-vtanh_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc2w-gemm_riscv64_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/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
--        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-vtanh_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
-+if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
-+    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"
-+    ]
- 
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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-vunary_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-rsum_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -94822,32 +99906,63 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c",
--        "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c",
--        "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
+-        "src/src/f32-rsum/gen/f32-rsum-neon-u16-acc4.c",
+-        "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c",
+-      ]
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-spmm_arm64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("qs8-f32-vcvt_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/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c",
+-        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c",
+-        "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c",
+-        "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c",
+-        "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
+-        "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
+-        "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -94871,15 +99986,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-spmm_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c",
--        "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c",
--        "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c",
+-        "src/src/f32-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" ]
@@ -94906,51 +100025,43 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-argmaxpool_arm64") {
+-    source_set("f32-vapproxgelu_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" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-neon-rational-12-10-div.c",
+-        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("qs8-packw_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    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/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-argmaxpool_arm64_standalone") {
--      cflags = []
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -94958,10 +100069,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vapproxgelu_arm64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-packw_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
+-        "src/src/f32-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" ]
@@ -94982,41 +100118,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f32-avgpool_arm64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
-+    ]
-+  
-+    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"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
--      ]
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("f32-vbinary_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -95024,6 +100134,53 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -95041,25 +100198,62 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vbinary_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("qs8-qc2w-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/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-minmax-fp32-scalar-fmagic.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "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/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" ]
@@ -95087,8 +100281,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16") {
--      cflags = [ "-march=armv8.2-a+bf16" ]
+-    source_set("f32-vclamp_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -95098,7 +100292,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c",
+-        "src/src/f32-vclamp/gen/f32-vclamp-neon.c",
+-        "src/src/f32-vclamp/gen/f32-vclamp-scalar.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -95110,16 +100305,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("qs8-qc2w-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/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"
 +    ]
  
 -      deps = [
@@ -95145,13 +100341,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+bf16" ]
+-    source_set("f32-vclamp_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.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" ]
@@ -95178,158 +100375,75 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-bf16-vcvt_arm64") {
+-    source_set("f32-vcmul_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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//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-vcmul/gen/f32-vcmul-neon-u8.c",
+-        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_riscv64") {
++  source_set("qs8-qc4w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_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-bf16-vcvt_arm64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "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 = [
--        "src/include/xnnpack.h",
--        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neon-u8.c",
--        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/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_arm64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-aarch64-neonfma-2x2.c",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-neon-2x2.c",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
--      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    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" ]
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-conv-hwc2chw_arm64_standalone") {
+-    source_set("f32-vcmul_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_riscv64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-qc4w-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/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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-aarch64-neonfma-2x2.c",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-neon-2x2.c",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
+-        "src/src/f32-vcmul/gen/f32-vcmul-neon-u8.c",
+-        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -95350,107 +100464,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv2d-chw_arm64") {
+-    source_set("f32-vcopysign_arm64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc2w-gemm_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-aarch64-neonfma-3x4.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-neon-2x4.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-aarch64-neonfma-2x4-acc2.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-neon-1x4.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-aarch64-neonfma-4x4.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-neon-1x4.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-aarch64-neonfma-1x4-acc2.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-neon-1x4.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-dwconv2d-chw_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      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",
+ 
+-      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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -95462,25 +100499,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vcopysign_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95488,20 +100523,48 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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/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"
 +    ]
  
--      asmflags = 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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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" ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S",
--      ]
+-  if (build_with_chromium) {
+-    source_set("f32-vcos_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -95509,23 +100572,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vcos/gen/f32-vcos-neon-rational-5-4-div.c",
+-        "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95533,22 +100595,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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/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" ]
--    }
--  }
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -95556,12 +100621,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      asmflags = cflags
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vcos_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S",
+-        "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" ]
@@ -95588,29 +100657,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-dwconv_arm64") {
+-    source_set("f32-velu_arm64") {
 -      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-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/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" ]
@@ -95625,15 +100680,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_riscv64") {
++  source_set("qs8-qc8w-dwconv_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/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -95646,7 +100705,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-velu_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -95657,24 +100716,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -95700,26 +100745,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-f16-vcvt_arm64") {
+-    source_set("f32-vexp_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_riscv64_standalone") {
++  source_set("qs8-qc8w-dwconv_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/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 = [
 -        "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/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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -95754,10 +100802,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-vexp_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95765,15 +100813,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-gemm/gen/qs8-qc8w-gemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-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/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" ]
@@ -95801,8 +100848,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-    source_set("f32-vgelu_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -95810,50 +100857,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      asmflags = 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",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
  
--      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",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -95861,22 +100880,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -95884,32 +100905,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      asmflags = cflags
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vgelu_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -95936,28 +100941,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-gemm_arm64") {
+-    source_set("f32-vhswish_arm64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-neon-lane-ld64.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x8s4-minmax-neonfma.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x16-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-aarch64-neonfma-lane-ld64.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-neon-lane-ld64.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-neon-lane-ld128.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x8s4-minmax-neonfma.c",
--        "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-gemm/gen/f32-gemm-6x8s4-minmax-neonfma.c",
+-        "src/src/f32-vhswish/gen/f32-vhswish-neon.c",
+-        "src/src/f32-vhswish/gen/f32-vhswish-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -95972,16 +100962,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_riscv64") {
++  source_set("qs8-qc8w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "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" ]
@@ -95994,7 +100983,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-gemm_arm64_standalone") {
+-    source_set("f32-vhswish_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -96005,23 +100994,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-gemm/gen/f32-gemm-1x16-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x8-minmax-neon-lane-ld64.c",
--        "src/src/f32-gemm/gen/f32-gemm-1x8s4-minmax-neonfma.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x16-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-aarch64-neonfma-lane-ld64.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-neon-lane-ld64.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-neon-lane-ld128.c",
--        "src/src/f32-gemm/gen/f32-gemm-4x8s4-minmax-neonfma.c",
--        "src/src/f32-gemm/gen/f32-gemm-6x8-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-gemm/gen/f32-gemm-6x8s4-minmax-neonfma.c",
+-        "src/src/f32-vhswish/gen/f32-vhswish-neon.c",
+-        "src/src/f32-vhswish/gen/f32-vhswish-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -96047,27 +101021,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-ibilinear-chw_arm64") {
+-    source_set("f32-vlog_arm64") {
 -      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-qc8w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neon-p8.c",
--        "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neonfma-p8.c",
--        "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c",
+-        "src/src/f32-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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -96102,10 +101074,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-ibilinear-chw_arm64_standalone") {
+-    source_set("f32-vlog_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96113,15 +101085,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neon-p8.c",
--        "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-neonfma-p8.c",
--        "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c",
+-        "src/src/f32-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" ]
@@ -96149,7 +101120,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-ibilinear_arm64") {
+-    source_set("f32-vlrelu_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -96160,9 +101131,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-ibilinear/gen/f32-ibilinear-neon-u8.c",
--        "src/src/f32-ibilinear/gen/f32-ibilinear-neonfma-u8.c",
--        "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-neon-u8.c",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -96174,7 +101144,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -96182,8 +101152,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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 = [
@@ -96209,15 +101179,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-ibilinear_arm64_standalone") {
+-    source_set("f32-vlrelu_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-ibilinear/gen/f32-ibilinear-neon-u8.c",
--        "src/src/f32-ibilinear/gen/f32-ibilinear-neonfma-u8.c",
--        "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-neon-u8.c",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -96244,54 +101213,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-igemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-    source_set("f32-vmulcaddc_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",
+-      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_riscv64") {
++  source_set("qs8-qc8w-igemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
++      "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"
 +    ]
  
--      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" ]
 +    configs -= [ "//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-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" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -96313,44 +101264,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
--
--      asmflags = cflags
+-    source_set("f32-vmulcaddc_arm64_standalone") {
+-      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-qc8w-igemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
++      "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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-igemm/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
--        "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a55.S",
--        "src/src/f32-igemm/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a73.S",
--        "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
--        "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
--        "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
--        "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
--        "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-asm-aarch64-neonfma-ld64.S",
--        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
--        "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
--        "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
--        "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
--        "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-cortex-a75.S",
--        "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-asm-aarch64-neonfma-ld128.S",
--        "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53-prfm.S",
--        "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a53.S",
--        "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-cortex-a75-prfm.S",
--        "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-asm-aarch64-neonfma-ld128.S",
+-        "src/src/f32-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" ]
@@ -96378,7 +101311,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-igemm_arm64") {
+-    source_set("f32-vrnd_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -96389,23 +101322,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-neon-lane-ld64.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x8s4-minmax-neonfma.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x16-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-aarch64-neonfma-lane-ld64.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-neon-lane-ld64.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-neon-lane-ld128.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x8s4-minmax-neonfma.c",
--        "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-igemm/gen/f32-igemm-6x8s4-minmax-neonfma.c",
+-        "src/src/f32-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" ]
@@ -96430,40 +101358,33 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-igemm_arm64_standalone") {
+-    source_set("f32-vrnd_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qu8-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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-igemm/gen/f32-igemm-1x16-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x8-minmax-neon-lane-ld64.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x8s4-minmax-neonfma.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x16-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-aarch64-neonfma-lane-ld64.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-neon-lane-ld64.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-neon-lane-ld128.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x8s4-minmax-neonfma.c",
--        "src/src/f32-igemm/gen/f32-igemm-6x8-minmax-aarch64-neonfma-lane-ld128.c",
--        "src/src/f32-igemm/gen/f32-igemm-6x8s4-minmax-neonfma.c",
+-        "src/src/f32-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" ]
@@ -96491,7 +101412,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-maxpool_arm64") {
+-    source_set("f32-vrsqrt_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -96502,8 +101423,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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-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",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -96515,16 +101437,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qu8-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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -      deps = [
@@ -96550,14 +101470,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vrsqrt_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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-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" ]
@@ -96584,18 +101505,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-qc4w-gemm_arm64") {
+-    source_set("f32-vsigmoid_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-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" ]
@@ -96610,17 +101527,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_riscv64") {
++  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96633,7 +101548,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsigmoid_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -96644,13 +101559,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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-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" ]
@@ -96676,30 +101587,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
--
--      asmflags = cflags
+-    source_set("f32-vsin_arm64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_riscv64_standalone") {
++  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      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-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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -96734,38 +101640,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-    source_set("f32-vsin_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-rdsum_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      asmflags = cflags
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      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-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" ]
@@ -96786,41 +101677,47 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-qc8w-gemm_arm64") {
+-    source_set("f32-vsqrt_arm64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
++    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-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-vsqrt/gen/f32-vsqrt-aarch64-neon-sqrt.c",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-rdsum_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -96844,18 +101741,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsqrt_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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-vsqrt/gen/f32-vsqrt-aarch64-neon-sqrt.c",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -96882,15 +101775,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-qs8-vcvt_arm64") {
+-    source_set("f32-vtanh_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-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" ]
@@ -96905,14 +101796,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_riscv64") {
++  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96925,7 +101817,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vtanh_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -96936,10 +101828,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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-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" ]
@@ -96965,26 +101855,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-qu8-vcvt_arm64") {
+-    source_set("f32-vunary_arm64") {
 -      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-rsum_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-rsum/gen/qs8-rsum-rvv-u2v.c"
 +    ]
  
 -      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-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" ]
@@ -97015,16 +101908,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vunary_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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-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" ]
@@ -97051,98 +101946,59 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-raddstoreexpminusmax_arm64") {
+-    source_set("operators_arm64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-neonfma-rr1-lut64-p2-u16-acc2.c",
--        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c",
+-        "src/src/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",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qs8-packw_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"
-+    ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-raddstoreexpminusmax_arm64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_riscv64_standalone") {
++if (build_with_chromium) {
++  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
  
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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" ]
@@ -97150,22 +102006,42 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("f32-rdminmax_arm64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("operators_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
 -      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/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" ]
@@ -97177,103 +102053,53 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-rdminmax_arm64_standalone") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_riscv64") {
+-  if (build_with_chromium) {
+-    source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-rsum_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
  
 -      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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/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",
 -      ]
--
--      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-rdsum2_arm64") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      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",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -      deps = [
@@ -97282,31 +102108,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-rdsum2_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-    source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2_standalone") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-neon.c",
--        "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c",
+-        "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme.c",
+-        "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -97326,42 +102145,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum_arm64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-neon-u16.c",
--        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c",
--      ]
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_riscv64") {
++  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    configs -= [ "//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/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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -97383,25 +102201,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-rdsum_arm64_standalone") {
--      cflags = []
+-    source_set("pf16-gemm_arch=armv8.2-a+sve+sve2_standalone") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_riscv64_standalone") {
++  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      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/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" ]
@@ -97429,8 +102249,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-rminmax_arm64") {
--      cflags = []
+-    source_set("pf32-gemm_arch=armv8.2-a+sve+sve2") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -97440,12 +102260,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -97470,30 +102288,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-rminmax_arm64_standalone") {
--      cflags = []
+-    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-qc8w-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vadd_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-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/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" ]
@@ -97521,8 +102335,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-rsum2_arm64") {
--      cflags = []
+-    source_set("pf32-igemm_arch=armv8.2-a+sve+sve2") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -97532,8 +102346,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/pf32-igemm/pf32-igemm-32x32-minmax-neonsme.c",
+-        "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme2.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -97545,17 +102359,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -97581,14 +102393,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-rsum2_arm64_standalone") {
--      cflags = []
+-    source_set("pf32-igemm_arch=armv8.2-a+sve+sve2_standalone") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rsum2/gen/f32-rsum2-neon.c",
--        "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.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" ]
@@ -97615,13 +102427,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-rsum_arm64") {
--      cflags = []
+-    source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 -
 -      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/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" ]
@@ -97636,19 +102448,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_riscv64") {
++  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -97661,8 +102469,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-rsum_arm64_standalone") {
--      cflags = []
+-    source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -97672,8 +102480,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -97699,203 +102507,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-spmm_arm64") {
--      cflags = []
+-    source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_riscv64_standalone") {
++  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c",
--        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c",
--        "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c",
--        "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c",
--        "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
--        "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
--        "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-spmm_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c",
--        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c",
--        "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c",
--        "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c",
--        "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
--        "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
--        "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f32-vapproxgelu_arm64") {
--      cflags = []
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-neon-rational-12-10-div.c",
--        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c",
+-        "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",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x1v-minmax-fp32-rvv.c"
-+    ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//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-vapproxgelu_arm64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
-+    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"
-+    ]
- 
--      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",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/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-vbinary_arm64") {
--      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -97903,53 +102544,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -97967,60 +102561,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vbinary_arm64_standalone") {
--      cflags = []
+-    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-qc8w-gemm_riscv64") {
++  source_set("qs8-vaddc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      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/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" ]
@@ -98048,8 +102607,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vclamp_arm64") {
--      cflags = []
+-    source_set("qb4-packw_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -98059,8 +102618,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c",
+-        "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -98072,15 +102631,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_riscv64_standalone") {
++  source_set("qs8-vaddc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -98106,14 +102665,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vclamp_arm64_standalone") {
--      cflags = []
+-    source_set("qb4-packw_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -98140,62 +102699,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vcmul_arm64") {
--      cflags = []
+-    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16") {
+-      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 -
 -      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/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",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x1v-minmax-fp32-rvv.c"
-+    ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-vcmul_arm64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++if (build_with_chromium) {
++  source_set("qs8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98203,14 +102728,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      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/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" ]
@@ -98231,15 +102774,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("f32-vcopysign_arm64") {
--      cflags = []
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -98247,21 +102815,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -98279,28 +102832,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vcopysign_arm64_standalone") {
--      cflags = []
+-    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-qc8w-igemm_riscv64") {
++  source_set("qs8-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      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/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" ]
@@ -98328,8 +102876,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vcos_arm64") {
--      cflags = []
+-    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -98339,8 +102887,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -98352,15 +102900,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_riscv64_standalone") {
++  source_set("qs8-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -98386,14 +102933,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vcos_arm64_standalone") {
--      cflags = []
+-    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -98420,15 +102967,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-velu_arm64") {
--      cflags = []
+-    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/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/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" ]
@@ -98443,14 +102989,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_riscv64") {
++  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -98463,8 +103010,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-velu_arm64_standalone") {
--      cflags = []
+-    source_set("qd8-f16-qc2w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -98474,10 +103021,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -98503,24 +103049,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vexp_arm64") {
+-    source_set("qd8-f16-qc2w-gemm_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qu8-packw_riscv64_standalone") {
++  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      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/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" ]
@@ -98555,10 +103101,115 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f16-qc2w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vlrelu_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    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-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16") {
+-      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-vlrelu_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++    ]
+ 
+-      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" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/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-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") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98566,13 +103217,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      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/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" ]
@@ -98600,8 +103251,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vgelu_arm64") {
--      cflags = []
+-    source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -98611,8 +103262,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -98624,7 +103275,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98632,7 +103283,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -98658,14 +103309,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vgelu_arm64_standalone") {
--      cflags = []
+-    source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/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/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" ]
@@ -98692,49 +103343,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vhswish_arm64") {
--      cflags = []
+-    source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vhswish/gen/f32-vhswish-neon.c",
--        "src/src/f32-vhswish/gen/f32-vhswish-scalar.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "src/src/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",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_riscv64") {
++  source_set("qs8-vmul_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vhswish_arm64_standalone") {
--      cflags = []
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -98742,10 +103384,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f16-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("qs8-vmul_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++    ]
+ 
 -      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/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" ]
@@ -98766,39 +103430,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f32-vlog_arm64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
-+    ]
- 
--      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",
--      ]
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/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-gemm_arch=armv8.2-a+dotprod+fp16") {
+-      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -98806,6 +103446,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -98823,10 +103476,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vlog_arm64_standalone") {
--      cflags = []
+-    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-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98834,13 +103487,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      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/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" ]
@@ -98867,9 +103522,123 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("f32-vlrelu_arm64") {
--      cflags = []
+-  if (build_with_chromium) {
+-    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-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",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
++if (build_with_chromium) {
++  source_set("qs8-vmulc_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++    ]
+ 
+-      asmflags = cflags
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      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",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -98877,46 +103646,44 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-neon-u8.c",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vmulc_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -98924,16 +103691,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vlrelu_arm64_standalone") {
--      cflags = []
+-      asmflags = cflags
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -98960,24 +103724,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vmulcaddc_arm64") {
--      cflags = []
+-    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/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/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-rsum_riscv64") {
++  source_set("qs8-vprelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -99010,25 +103773,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vmulcaddc_arm64_standalone") {
--      cflags = []
+-    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-rsum_riscv64_standalone") {
++  source_set("qs8-vprelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c",
--        "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/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" ]
@@ -99056,8 +103818,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vrnd_arm64") {
--      cflags = []
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16") {
+-      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -99067,18 +103829,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -99103,34 +103857,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vrnd_arm64_standalone") {
--      cflags = []
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vpreluc_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      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/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" ]
@@ -99158,8 +103903,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vrsqrt_arm64") {
--      cflags = []
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -99169,9 +103914,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
 +  }
@@ -99183,15 +103927,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vpreluc_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      deps = [
@@ -99217,15 +103960,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vrsqrt_arm64_standalone") {
--      cflags = []
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -99252,14 +103994,122 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vsigmoid_arm64") {
--      cflags = []
+-    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" ]
+ 
+-      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",
+-      ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_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") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 -
 -      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/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" ]
@@ -99274,15 +104124,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_riscv64") {
++  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
++      "src/src/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" ]
@@ -99295,8 +104146,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vsigmoid_arm64_standalone") {
--      cflags = []
+-    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -99306,9 +104157,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -99334,25 +104184,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vsin_arm64") {
--      cflags = []
+-    source_set("qd8-f32-qb4w-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("qs8-vadd_riscv64_standalone") {
++  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/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/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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -99387,24 +104238,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vsin_arm64_standalone") {
--      cflags = []
+-    source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-dwconv_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
 -        "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/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" ]
@@ -99432,8 +104285,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vsqrt_arm64") {
--      cflags = []
+-    source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -99443,8 +104296,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -99456,15 +104309,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-dwconv_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      deps = [
@@ -99490,14 +104345,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vsqrt_arm64_standalone") {
--      cflags = []
+-    source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -99524,13 +104379,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vtanh_arm64") {
+-    source_set("qd8-f32-qb4w-gemm_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/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" ]
@@ -99545,15 +104402,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_riscv64") {
++  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -99566,7 +104423,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qb4w-gemm_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -99577,8 +104434,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -99604,50 +104463,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vunary_arm64") {
--      cflags = []
+-    source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_riscv64_standalone") {
++  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//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/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" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -99655,143 +104500,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vunary_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//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("operators_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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_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-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-f32-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("operators_arm64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/operators/argmax-pooling-nhwc.c",
--        "src/src/operators/average-pooling-nhwc.c",
--        "src/src/operators/batch-matrix-multiply-nc.c",
--        "src/src/operators/binary-elementwise-nd.c",
--        "src/src/operators/constant-pad-nd.c",
--        "src/src/operators/convolution-nchw.c",
--        "src/src/operators/convolution-nhwc.c",
--        "src/src/operators/deconvolution-nhwc.c",
--        "src/src/operators/dynamic-fully-connected-nc.c",
--        "src/src/operators/fingerprint_cache.c",
--        "src/src/operators/fingerprint_id.c",
--        "src/src/operators/fully-connected-nc.c",
--        "src/src/operators/max-pooling-nhwc.c",
--        "src/src/operators/pack-lh.c",
--        "src/src/operators/reduce-nd.c",
--        "src/src/operators/resize-bilinear-nchw.c",
--        "src/src/operators/resize-bilinear-nhwc.c",
--        "src/src/operators/rope-nthc.c",
--        "src/src/operators/slice-nd.c",
--        "src/src/operators/softmax-nc.c",
--        "src/src/operators/transpose-nd.c",
--        "src/src/operators/unary-elementwise-nc.c",
--        "src/src/operators/unpooling-nhwc.c",
+-        "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" ]
@@ -99812,30 +104555,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-    source_set("qd8-f32-qc2w-gemm_arm64") {
+-      cflags = []
 +# 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("qu8-f32-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      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/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" ]
@@ -99870,13 +104623,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
--
+-    source_set("qd8-f32-qc2w-gemm_arm64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
++    ]
+ 
 -      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/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -99898,31 +104662,79 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("qs8-vcvt_riscv64") {
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc4w-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-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      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/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" ]
@@ -99934,6 +104746,54 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("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 = [
@@ -99951,26 +104811,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-    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("qs8-vcvt_riscv64_standalone") {
++  source_set("qu8-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-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 = [
 -        "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/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" ]
@@ -99998,8 +104857,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("pf32-gemm_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-    source_set("qd8-f32-qc4w-gemm_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -100009,10 +104868,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -100037,10 +104896,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-    source_set("qd8-f32-qc4w-gemm_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100048,15 +104907,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-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/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/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" ]
@@ -100077,38 +104937,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("pf32-igemm_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      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",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
  
--      configs -= [ "//build/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-qc8w-gemm_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100116,9 +104966,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-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-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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -100142,14 +105006,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-    source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme.c",
--        "src/src/pf32-igemm/pf32-igemm-32x32-minmax-neonsme2.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" ]
@@ -100176,35 +105042,63 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
--
+-    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") {
++    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"
++    ]
+ 
+-      asmflags = cflags
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/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/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",
 -      ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qs8-vlrelu_riscv64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-igemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-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" ]
@@ -100217,19 +105111,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-    source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      asmflags = cflags
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      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/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" ]
@@ -100249,41 +105146,111 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-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",
+-      ]
++if (build_with_chromium) {
++  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
++    ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    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("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f32-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-vlrelu_riscv64_standalone") {
++  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      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/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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc8w-gemm_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -100291,6 +105258,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -100308,25 +105291,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-    source_set("qd8-f32-qc8w-gemm_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-rdsum_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/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -      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/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -100347,48 +105333,50 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qb4-packw_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/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c",
--        "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-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" ]
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc8w-igemm_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("qs8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-rdsum_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/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -100412,14 +105400,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -100446,35 +105436,63 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16") {
--      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
--
+-    source_set("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") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.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" ]
+ 
 -      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/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",
 -      ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qs8-vmul_riscv64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -100487,19 +105505,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
+-    source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      asmflags = cflags
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c",
+-        "src/src/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" ]
@@ -100519,40 +105540,109 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-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",
+-      ]
++if (build_with_chromium) {
++  source_set("qu8-rsum_riscv64") {
++    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" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//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("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f32-qc8w-igemm_arch=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-vmul_riscv64_standalone") {
++  source_set("qu8-rsum_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      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/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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc8w-igemm_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -100560,6 +105650,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -100577,10 +105685,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("qd8-f32-qc8w-igemm_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100588,13 +105696,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      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/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" ]
@@ -100622,8 +105737,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -100633,8 +105748,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -100646,7 +105762,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -100654,7 +105770,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -100680,14 +105796,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qp8-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-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/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" ]
@@ -100714,14 +105831,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qc2w-gemm_arch=armv8.2-a+dotprod+fp16") {
--      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
+-    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/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/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -100736,14 +105851,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_riscv64") {
++  source_set("qu8-vadd_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-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" ]
@@ -100756,8 +105872,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
+-    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -100767,101 +105883,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("qd8-f16-qc2w-gemm_arm64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qc2w-gemm_arm64_standalone") {
--      cflags = []
-+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"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c",
+-        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -100882,41 +105904,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16") {
--      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
+-    source_set("qp8-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("qs8-vprelu_riscv64_standalone") {
++  source_set("qu8-vadd_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c4-minmax-neondotfp16arith.c",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c4-minmax-neondotfp16arith.c",
+-        "src/src/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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -100951,23 +105963,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
+-    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_riscv64") {
++  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c4-minmax-neondotfp16arith.c",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c4-minmax-neondotfp16arith.c",
+-        "src/src/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" ]
@@ -100995,8 +106009,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -101006,8 +106020,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -101019,14 +106032,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vpreluc_riscv64_standalone") {
++  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -101052,14 +106066,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -101086,73 +106099,61 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 -
 -      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/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",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
-+    ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  source_set("qu8-vaddc_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qc4w-gemm_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-vrpreluc_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
+-    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      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/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -101173,15 +106174,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-vaddc_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qp8-f32-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" ]
  
--  if (build_with_chromium) {
--    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16") {
--      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -101189,19 +106216,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -101219,10 +106233,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
+-    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-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -101230,16 +106244,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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-vcvt/gen/qu8-vcvt-rvv-u4v.c"
 +    ]
  
 -      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/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" ]
@@ -101267,8 +106279,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -101278,8 +106290,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -101291,7 +106302,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -101299,8 +106310,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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-vcvt/gen/qu8-vcvt-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -101326,14 +106336,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -101360,95 +106369,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-    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-dwconv_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
-+    ]
- 
--      asmflags = cflags
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/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",
--      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_riscv64_standalone") {
++  source_set("qu8-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
--      asmflags = cflags
-+    public_configs = [ ":xnnpack_public_config" ]
- 
 -      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/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" ]
@@ -101460,90 +106399,48 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("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-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",
+-        "//third_party/pthreadpool",
 -      ]
-+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/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
-+    ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-      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" ]
    }
 +}
  
 -  # 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" ]
+-    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vcvt_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-vcvt/gen/qu8-vcvt-scalar-u4.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",
+-        "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" ]
@@ -101571,8 +106468,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    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" ]
+-    source_set("qs8-dwconv_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -101582,10 +106479,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -101610,25 +106510,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
+-    source_set("qs8-dwconv_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_riscv64") {
++  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      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/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" ]
@@ -101656,7 +106560,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16") {
+-    source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -101667,8 +106571,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -101680,14 +106583,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_riscv64_standalone") {
++  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -101713,14 +106617,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-f16-vcvt_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-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/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -101747,31 +106650,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
+-    source_set("qs8-f32-vcvt_arm64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
+-      ]
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vlrelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
--      asmflags = cflags
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-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",
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -101780,60 +106691,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-f32-vcvt_arm64_standalone") {
+-      cflags = []
 +# 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-vlrelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_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+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
--      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/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" ]
@@ -101853,46 +106736,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("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-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" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+if (build_with_chromium) {
-+  source_set("qu8-gemm_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"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
 -    }
 -  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -101900,21 +106743,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-  if (build_with_chromium) {
+-    source_set("qs8-packw_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-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/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" ]
@@ -101926,60 +106770,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qb4w-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-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"
-+    ]
- 
--      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",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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" ]
@@ -101993,10 +106783,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-packw_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102004,14 +106794,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.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/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" ]
@@ -102039,8 +106830,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-qc2w-gemm_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -102050,8 +106841,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c4-minmax-fp32-neondot.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-8x8c4-minmax-fp32-neondot.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -102063,7 +106854,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102071,8 +106862,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    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-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -102098,14 +106888,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/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/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" ]
@@ -102132,15 +106922,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qb4w-gemm_arm64") {
+-    source_set("qs8-qc2w-gemm_arm64") {
 -      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/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" ]
@@ -102155,15 +106945,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_riscv64") {
++  source_set("qu8-vmul_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -102176,7 +106965,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-qc2w-gemm_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -102187,10 +106976,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -102216,26 +107005,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-
+-      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_riscv64_standalone") {
++  source_set("qu8-vmul_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.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",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x16-minmax-fp32-asm-aarch64-neondot-ld128.S",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -102270,10 +107059,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    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-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102281,14 +107070,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.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" ]
+ 
 -      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/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" ]
@@ -102309,11 +107103,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -102326,11 +107115,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qc2w-gemm_arm64") {
+-    source_set("qs8-qc4w-gemm_arm64") {
 -      cflags = []
 +# 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-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102338,12 +107127,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-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/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -102378,22 +107168,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-qc4w-gemm_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("qu8-rdsum_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -102415,77 +107196,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-qc4w-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-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_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-rdsum_riscv64_standalone") {
++if (build_with_chromium) {
++  source_set("qu8-vmulc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-dwconv_arm64") {
+-      cflags = []
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc4w-gemm_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",
+-        "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" ]
@@ -102497,54 +107242,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("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-rsum_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
-+    ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
 +    deps = [
@@ -102562,25 +107259,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qs8-qc8w-dwconv_arm64_standalone") {
+-      cflags = []
 +# 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-vmulc_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-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c",
+-        "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" ]
@@ -102608,8 +107316,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qc4w-gemm_arm64") {
--      cflags = []
+-    source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -102619,10 +107327,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -102647,25 +107355,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = []
+-    source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_riscv64") {
++  source_set("qu8-vprelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
  
 -      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/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" ]
@@ -102686,43 +107394,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      asmflags = cflags
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
-+    ]
- 
 -      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/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" ]
@@ -102736,14 +107440,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vprelu_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -102751,18 +107471,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-      asmflags = cflags
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -102789,30 +107512,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-    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-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",
+-      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vpreluc_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-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" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-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",
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -102821,34 +107553,51 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-gemm_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-vadd_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vpreluc_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-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
  
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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" ]
@@ -102856,10 +107605,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-gemm_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -102867,13 +107615,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      asmflags = cflags
-+    public_configs = [ ":xnnpack_public_config" ]
- 
 -      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/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" ]
@@ -102885,50 +107635,84 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-gemm_arm64_standalone") {
+-      cflags = []
 -
 -      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/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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/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_riscv64") {
++  source_set("qu8-vrpreluc_riscv64") {
 +    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/include/xnnpack.h",
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -102950,25 +107734,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_riscv64_standalone") {
-+    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"
-+    ]
- 
+-    source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-neoni8mm.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c8-minmax-neoni8mm.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" ]
@@ -102990,14 +107764,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-vrpreluc_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc8w-gemm_arm64") {
--      cflags = []
+-      asmflags = cflags
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -103007,13 +107794,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -103038,29 +107828,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = []
+-    source_set("qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-
+-      asmflags = cflags
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("reference_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
  
 -      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/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" ]
@@ -103081,51 +107877,49 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-fp32-neoni8mm.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c8-minmax-fp32-neoni8mm.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("reference_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/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
  
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -103149,16 +107943,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -103185,63 +107977,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    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-vaddc_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
-+    ]
- 
--      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("qs8-qc8w-igemm_arm64") {
+-      cflags = []
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-cortex-a55.S",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c4-minmax-asm-aarch64-neondot-ld128.S",
+-        "src/src/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",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_riscv64_standalone") {
++if (build_with_chromium) {
++  source_set("s8-ibilinear_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -103254,22 +108023,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-    source_set("qs8-qc8w-igemm_arm64_standalone") {
+-      cflags = []
 +    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-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/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" ]
@@ -103289,111 +108060,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qd8-f32-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",
--      ]
-+if (build_with_chromium) {
-+  source_set("qu8-vcvt_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-rvv-u4v.c"
-+    ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//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-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-  if (build_with_chromium) {
+-    source_set("qs8-qu8-packw_arm64") {
+-      cflags = []
 +# 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("s8-ibilinear_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-rvv-u4v.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-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" ]
  
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc8w-igemm_arm64") {
--      cflags = []
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -103401,24 +108100,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -103436,30 +108117,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-qu8-packw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_riscv64") {
++  source_set("s8-maxpool_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/s8-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      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/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -103487,8 +108161,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qs8-rdsum_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -103498,9 +108172,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-4x4c8s2-aarch64-neondot.c",
+-        "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-neon-u32.c",
+-        "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -103512,14 +108185,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_riscv64_standalone") {
++  source_set("s8-maxpool_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/s8-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -103545,15 +108219,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qs8-rdsum_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-4x4c8s2-aarch64-neondot.c",
+-        "src/src/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" ]
@@ -103580,12 +108253,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qs8-rsum_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c",
+-        "src/src/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -103600,15 +108273,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("s8-maxpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -103619,117 +108291,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("qp8-f32-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-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/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" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
-+if (build_with_chromium) {
-+  source_set("qu8-vlrelu_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
+-  # 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") {
+-      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/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/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -103750,60 +108325,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c",
--      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("qs8-rsum_arm64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_riscv64_standalone") {
++  source_set("s8-maxpool_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-      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",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    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",
@@ -103811,48 +108365,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-rsum_arm64_standalone") {
+-      cflags = []
 -
 -      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/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" ]
@@ -103864,10 +108400,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vmul_arch=rv64gcv-abi=lp64d") {
++  source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -103875,32 +108419,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.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" ]
--    }
--  }
+-  if (build_with_chromium) {
+-    source_set("qs8-vadd_arm64") {
+-      cflags = []
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
 -      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/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" ]
@@ -103912,25 +108448,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 -    }
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vadd_arm64_standalone") {
+-      cflags = []
 +# 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("s8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -103938,24 +108477,45 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c4-mstep4-aarch64-neondot.c",
--        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c4-aarch64-neondot.c",
--        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c8-aarch64-neondot.c",
+-        "src/src/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" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("qs8-vaddc_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -103963,6 +108523,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -103980,24 +108553,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qs8-vaddc_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_riscv64") {
++  source_set("s8-rdminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/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/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" ]
@@ -104025,8 +108600,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qs8-vcvt_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -104036,7 +108611,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -104048,14 +108624,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_riscv64_standalone") {
++  source_set("s8-rdminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      deps = [
@@ -104081,13 +108658,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qs8-vcvt_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-neon-u32.c",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -104114,26 +108692,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
-+if (build_with_chromium) {
-+  source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
-+    ]
- 
+-    source_set("qs8-vlrelu_arm64") {
+-      cflags = []
+-
 -      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/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" ]
@@ -104147,47 +108712,43 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++if (build_with_chromium) {
++  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d") {
++    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"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    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("qs8-vlrelu_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
-+    ]
  
 -      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/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" ]
@@ -104208,38 +108769,49 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("qs8-dwconv_arm64") {
+-    source_set("qs8-vmul_arm64") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d_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"
 +    ]
  
 -      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/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" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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",
@@ -104257,28 +108829,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vmul_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_riscv64") {
++  source_set("s8-rminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
 -        "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/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" ]
@@ -104306,8 +108875,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("qs8-vmulc_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -104317,7 +108886,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.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",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -104329,14 +108899,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vmulc_riscv64_standalone") {
++  source_set("s8-rminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      deps = [
@@ -104362,13 +108934,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("qs8-vmulc_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-neonfp16arith-u32.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" ]
@@ -104395,73 +108968,59 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-f32-vcvt_arm64") {
+-    source_set("qs8-vprelu_arm64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
+-        "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qu8-vprelu_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
-+    ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  source_set("s8-vclamp_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-f32-vcvt_arm64_standalone") {
+-    source_set("qs8-vprelu_arm64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
+-        "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -104482,35 +109041,46 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("qs8-packw_arm64") {
+-    source_set("qs8-vpreluc_arm64") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("s8-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
 +    ]
  
 -      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-vpreluc/gen/qs8-vpreluc-scalar-u8.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -104528,25 +109098,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vpreluc_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_riscv64") {
++  source_set("s8-vclamp_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -      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-vpreluc/gen/qs8-vpreluc-scalar-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -104574,8 +109141,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qs8-vrpreluc_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -104585,8 +109152,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c4-minmax-fp32-neondot.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-8x8c4-minmax-fp32-neondot.c",
+-        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -104598,14 +109164,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vpreluc_riscv64_standalone") {
++  source_set("s8-vclamp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -104631,14 +109197,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qs8-vrpreluc_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c4-minmax-fp32-neondot.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-8x8c4-minmax-fp32-neondot.c",
+-        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -104665,15 +109230,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-qc2w-gemm_arm64") {
+-    source_set("qu8-dwconv_arm64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-minmax-fp32-scalar-fmagic.c",
+-        "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" ]
@@ -104688,14 +109255,43 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_riscv64") {
++  source_set("subgraph_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -104708,7 +109304,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-dwconv_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -104719,10 +109315,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -104748,26 +109346,53 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-qc4w-gemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
--
--      asmflags = cflags
+-    source_set("qu8-f32-vcvt_arm64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vrpreluc_riscv64_standalone") {
++  source_set("subgraph_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.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 = [
 -        "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/qu8-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -104802,38 +109427,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-    source_set("qu8-f32-vcvt_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("reference_riscv64") {
++  source_set("tables_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      asmflags = cflags
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "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 = [
 -        "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/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" ]
@@ -104854,31 +109472,53 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-qc4w-gemm_arm64") {
--      cflags = []
+-      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("reference_riscv64_standalone") {
++  source_set("tables_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/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 = [
 -        "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/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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -104913,13 +109553,38 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = []
--
+-    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") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      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-1x4-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.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" ]
@@ -104940,42 +109605,77 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+if (build_with_chromium) {
-+  source_set("s8-ibilinear_riscv64") {
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-gemm_arm64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("u8-ibilinear_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-dwconv_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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-gemm_arm64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      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/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" ]
@@ -104987,7 +109687,46 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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 (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    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") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++    ]
+ 
+-      asmflags = cflags
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      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",
 -      ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -104996,44 +109735,151 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("u8-lut32norm_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++    ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      asmflags = cflags
 +    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
+-        "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 (!(is_android && 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_arm64_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qu8-igemm_arm64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_riscv64_standalone") {
+-
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++if (build_with_chromium) {
++  source_set("u8-maxpool_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/u8-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-igemm_arm64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-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/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" ]
@@ -105054,15 +109900,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-rdsum_arm64") {
+-      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") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c"
++    ]
+ 
+-      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",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-gemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -105070,19 +109942,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -105100,26 +109959,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qu8-rdsum_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("u8-maxpool_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/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      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/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" ]
@@ -105147,8 +110004,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-    source_set("qu8-rsum_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -105156,61 +110013,45 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      asmflags = 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",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
  
--      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",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("u8-maxpool_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/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -105218,21 +110059,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      asmflags = cflags
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-rsum_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -105259,40 +110095,53 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qu8-vadd_arm64") {
+-      cflags = []
 -
 -      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/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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_riscv64") {
++  source_set("u8-rdminmax_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/u8-rdminmax/gen/u8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/u8-rdminmax/gen/u8-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" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-vadd_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -105300,32 +110149,59 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_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("qs8-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-  if (build_with_chromium) {
+-    source_set("qu8-vaddc_arm64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_riscv64_standalone") {
++  source_set("u8-rdminmax_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/u8-rdminmax/gen/u8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      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/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" ]
@@ -105337,24 +110213,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
--      }
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-gemm_arm64") {
--      cflags = []
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -105362,15 +110230,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-vaddc_arm64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      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/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" ]
@@ -105382,31 +110253,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc8w-gemm_arm64_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qu8-vcvt_arm64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16-minmax-fp32-neonv8-mlal-lane.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neon-mlal.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neon-mlal.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -105418,56 +110286,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("u8-rdminmax_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/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-vcvt_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -105475,23 +110319,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c4-minmax-fp32-neondot.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c4-minmax-fp32-neondot.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c4-minmax-fp32-neondot.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c4-minmax-fp32-neondot.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -105512,30 +110343,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vlrelu_arm64") {
+-      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("u8-rdminmax_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/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-      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",
+-      ]
 +    configs -= [ "//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
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -105543,25 +110384,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -105579,34 +110401,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
--
--      asmflags = cflags
+-    source_set("qu8-vlrelu_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_riscv64") {
++  source_set("u8-rminmax_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/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 = [
 -        "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/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" ]
@@ -105634,8 +110448,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-qc8w-igemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qu8-vmul_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -105645,8 +110459,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
+-        "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -105658,15 +110472,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-rminmax_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/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 = [
@@ -105692,14 +110508,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qu8-vmul_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -105726,18 +110542,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-qc8w-igemm_arm64") {
+-    source_set("qu8-vmulc_arm64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16-minmax-fp32-neonv8-mlal-lane.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neon-mlal.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c2s4-minmax-fp32-neonv8-mlal.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neon-mlal.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-2x8c2s4-minmax-fp32-neonv8-mlal.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c",
+-        "src/src/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" ]
@@ -105752,17 +110563,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("u8-rminmax_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/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" ]
@@ -105775,7 +110585,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vmulc_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -105786,13 +110596,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -105818,26 +110623,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-qu8-packw_arm64") {
+-    source_set("qu8-vprelu_arm64") {
 -      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("u8-rminmax_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/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
+-        "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -105872,24 +110676,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vprelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_riscv64") {
++  source_set("u8-vclamp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
+-        "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -105917,7 +110720,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-rdsum_arm64") {
+-    source_set("qu8-vpreluc_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -105928,8 +110731,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -105941,16 +110743,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -105976,14 +110777,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vpreluc_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -106010,12 +110810,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-rsum_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qu8-vrpreluc_arm64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.c",
+-        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -106030,15 +110830,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_arch=rv64gcv-abi=lp64d") {
++  source_set("u8-vclamp_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -106051,8 +110850,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qu8-vrpreluc_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -106062,7 +110861,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-rsum/gen/qs8-rsum-neondot-u32-acc2.c",
+-        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -106088,189 +110887,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-rsum_arm64") {
+-    source_set("reference_arm64") {
 -      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("u8-vclamp_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
-+    ]
- 
--      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",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-rsum_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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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/reference/binary-elementwise.cc",
+-        "src/src/reference/packing.cc",
+-        "src/src/reference/unary-elementwise.cc",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
-+if (build_with_chromium) {
-+  source_set("s8-vclamp_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
-+    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vadd_arm64") {
--      cflags = []
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/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",
--      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vadd_arm64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
-+    ]
- 
--      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" ]
--      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vaddc_arm64") {
--      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -106278,19 +110923,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -106308,53 +110940,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("reference_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("subgraph_riscv64") {
++  source_set("x16-transposec_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/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/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
  
 -      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/reference/binary-elementwise.cc",
+-        "src/src/reference/packing.cc",
+-        "src/src/reference/unary-elementwise.cc",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -106382,7 +110985,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-vcvt_arm64") {
+-    source_set("s8-ibilinear_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -106393,8 +110996,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/s8-ibilinear/gen/s8-ibilinear-neon-u16.c",
+-        "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
+-        "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -106406,42 +111010,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("subgraph_riscv64_standalone") {
++  source_set("x16-transposec_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/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/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
  
 -      deps = [
@@ -106467,14 +111043,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-ibilinear_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -106501,13 +111078,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-vlrelu_arm64") {
+-    source_set("s8-maxpool_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/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" ]
@@ -106522,22 +111099,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("tables_riscv64") {
++  source_set("x16-x32-packw_riscv64") {
 +    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/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" ]
@@ -106550,7 +111120,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-maxpool_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -106561,8 +111131,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -106588,42 +111158,48 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-vmul_arm64") {
+-    source_set("s8-rdminmax_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("tables_riscv64_standalone") {
++  source_set("x16-x32-packw_riscv64_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/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
++    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-rndnu-neon-ld64-u16.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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -106631,40 +111207,55 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rdminmax_arm64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//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("qs8-vmul_arm64_standalone") {
+-  if (build_with_chromium) {
+-    source_set("s8-rminmax_arm64") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("u8-ibilinear_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
-+    ]
- 
+-
 -      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/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" ]
@@ -106676,14 +111267,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++if (build_with_chromium) {
++  source_set("x24-transposec_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
++    ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 -    }
 -  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -106691,8 +111288,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("qs8-vmulc_arm64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("s8-rminmax_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -106703,92 +111301,96 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c",
+-        "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
+-        "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c",
+-        "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
+-        "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
+-        "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//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" ]
- 
+-
 -      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 -    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vmulc_arm64_standalone") {
+-  if (build_with_chromium) {
+-    source_set("s8-vclamp_arm64") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x24-transposec_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
++    ]
  
 -      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/s8-vclamp/s8-vclamp-neon-u64.c",
+-        "src/src/s8-vclamp/s8-vclamp-scalar-u4.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-vprelu_arm64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("s8-vclamp_arm64_standalone") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.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" ]
@@ -106800,41 +111402,68 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-lut32norm_riscv64") {
++  source_set("x32-packw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-  if (build_with_chromium) {
+-    source_set("subgraph_arm64") {
+-      cflags = []
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vprelu_arm64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.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" ]
@@ -106846,47 +111475,99 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 -    }
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-vpreluc_arm64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("subgraph_arm64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-lut32norm_riscv64_standalone") {
++  source_set("x32-packw_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/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("tables_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -106894,6 +111575,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/tables/exp2-k-over-2048.c",
+-        "src/src/tables/exp2-k-over-64.c",
+-        "src/src/tables/exp2minus-k-over-16.c",
+-        "src/src/tables/exp2minus-k-over-2048.c",
+-        "src/src/tables/exp2minus-k-over-32.c",
+-        "src/src/tables/exp2minus-k-over-4.c",
+-        "src/src/tables/exp2minus-k-over-64.c",
+-        "src/src/tables/exp2minus-k-over-8.c",
+-        "src/src/tables/vlog.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -106911,23 +111610,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("tables_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("x32-packw_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/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 = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.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" ]
@@ -106955,7 +111666,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qs8-vrpreluc_arm64") {
+-    source_set("u8-ibilinear_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -106966,7 +111677,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c",
+-        "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u16.c",
+-        "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c",
+-        "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -106978,15 +111691,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("x32-packw_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/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"
 +    ]
  
 -      deps = [
@@ -107012,13 +111729,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-ibilinear_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.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" ]
@@ -107045,17 +111764,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-dwconv_arm64") {
+-    source_set("u8-lut32norm_arm64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-rndnu-neon-mul8.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-rndnu-neon-mul8.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c",
+-        "src/src/u8-lut32norm/u8-lut32norm-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -107070,14 +111784,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_riscv64") {
++  source_set("x32-transposec_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/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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107090,7 +111808,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-lut32norm_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -107101,12 +111819,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/u8-lut32norm/u8-lut32norm-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -107132,24 +111845,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-f32-vcvt_arm64") {
+-    source_set("u8-maxpool_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_riscv64_standalone") {
++  source_set("x32-transposec_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/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 = [
 -        "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/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" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -107184,25 +111901,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-maxpool_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("u8-rdminmax_arch=rv64gcv-abi=lp64d") {
-+    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"
-+    ]
- 
+-
 -      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/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" ]
@@ -107224,100 +111929,44 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
--      asmflags = 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") {
++if (build_with_chromium) {
++  source_set("x32-transposec_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/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
--        "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
--        "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
--        "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
--      ]
+-  if (build_with_chromium) {
+-    source_set("u8-rdminmax_arm64") {
+-      cflags = []
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/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" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
-+if (build_with_chromium) {
-+  source_set("u8-rdminmax_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
-+    ]
-+
-+    configs -= [ "//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",
@@ -107325,61 +111974,34 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 -    }
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qu8-gemm_arm64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("u8-rdminmax_arm64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_riscv64_standalone") {
++  source_set("x32-transposec_riscv64_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/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
  
 -      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/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" ]
@@ -107391,16 +112013,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-  if (build_with_chromium) {
+-    source_set("u8-rminmax_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -107408,21 +112038,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-gemm_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
 -      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/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" ]
@@ -107434,50 +112057,69 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("u8-rminmax_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("x32-unpool_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/x32-unpool/x32-unpool-scalar.c"
 +    ]
  
--      asmflags = 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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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" ]
  
--      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",
--      ]
+-  if (build_with_chromium) {
+-    source_set("u8-vclamp_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -107485,47 +112127,45 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
+-        "src/src/u8-vclamp/u8-vclamp-scalar-u4.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("x32-unpool_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/x32-unpool/x32-unpool-scalar.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -107533,15 +112173,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      asmflags = cflags
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("u8-vclamp_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
--        "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
--        "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
--        "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
+-        "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
+-        "src/src/u8-vclamp/u8-vclamp-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -107568,18 +112209,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-igemm_arm64") {
--      cflags = []
+-    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/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/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" ]
@@ -107594,16 +112232,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_riscv64") {
++  source_set("x64-transposec_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/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107616,8 +112252,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-igemm_arm64_standalone") {
--      cflags = []
+-    source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -107627,13 +112263,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -107659,27 +112292,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-rdsum_arm64") {
+-    source_set("x16-packw_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_riscv64_standalone") {
++  source_set("x64-transposec_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/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
  
 -      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/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",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -107714,25 +112344,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-packw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_arch=rv64gcv-abi=lp64d") {
++  source_set("x8-lut_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -      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/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -107760,7 +112388,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-rsum_arm64") {
+-    source_set("x16-transposec_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -107771,8 +112399,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
+-        "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -107784,15 +112412,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-lut_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -107818,14 +112445,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-transposec_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -107852,15 +112479,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vadd_arm64") {
+-    source_set("x16-x32-packw_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/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" ]
@@ -107875,14 +112500,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_riscv64") {
++  source_set("x8-packq_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107895,7 +112520,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-x32-packw_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -107906,10 +112531,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -107935,47 +112558,35 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vaddc_arm64") {
+-    source_set("x24-transposec_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_riscv64_standalone") {
++  source_set("x8-packq_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
  
 -      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//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/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" ]
 +    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",
@@ -107983,51 +112594,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vaddc_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qu8-vcvt_arm64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("x24-transposec_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/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" ]
@@ -108039,42 +112630,44 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-transposec_riscv64") {
++  source_set("x8-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.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" ]
--    }
--  }
+-  if (build_with_chromium) {
+-    source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vcvt_arm64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
 -      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/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" ]
@@ -108086,48 +112679,75 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 -    }
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qu8-vlrelu_arm64") {
--      cflags = []
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_riscv64_standalone") {
++  source_set("x8-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.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/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
--        "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-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" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/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("x32-packw_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -108135,6 +112755,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -108152,24 +112792,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-packw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_riscv64") {
++  source_set("x8-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/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
 -      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/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" ]
@@ -108190,62 +112838,52 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-vmul_arm64") {
--      cflags = []
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      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",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
  
--      configs -= [ "//build/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("x32-transposec_arm64") {
+-      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("x8-transposec_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
-+    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
++      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-      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",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    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",
@@ -108253,96 +112891,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vmul_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qu8-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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//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("x24-transposec_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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("qu8-vmulc_arm64_standalone") {
+-    source_set("x32-transposec_arm64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  source_set("xx-copy_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
  
 -      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/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" ]
@@ -108363,28 +112946,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vprelu_arm64") {
+-    source_set("x32-unpool_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x24-transposec_riscv64_standalone") {
++  source_set("xx-copy_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c",
+-        "src/src/x32-unpool/x32-unpool-neon.c",
+-        "src/src/x32-unpool/x32-unpool-scalar.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -108419,23 +113015,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-unpool_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x32-packw_arch=rv64gcv-abi=lp64d") {
++  source_set("xx-fill_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c",
+-        "src/src/x32-unpool/x32-unpool-neon.c",
+-        "src/src/x32-unpool/x32-unpool-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -108463,7 +113059,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qu8-vpreluc_arm64") {
+-    source_set("x64-transposec_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -108474,7 +113070,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c",
+-        "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c",
+-        "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c",
+-        "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -108486,15 +113084,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("xx-fill_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
  
 -      deps = [
@@ -108520,13 +113117,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x64-transposec_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.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" ]
@@ -108553,53 +113152,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vrpreluc_arm64") {
+-    source_set("x8-lut_arm64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c",
+-        "src/src/x8-lut/gen/x8-lut-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x32-packw_riscv64") {
++  source_set("xx-pad_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/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" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_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-vrpreluc_arm64_standalone") {
--      cflags = []
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -108607,9 +113193,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-lut_arm64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("xx-pad_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.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" ]
@@ -108630,45 +113239,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("reference_arm64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_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"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/reference/binary-elementwise.cc",
--        "src/src/reference/packing.cc",
--        "src/src/reference/unary-elementwise.cc",
--      ]
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -108676,6 +113255,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -108693,31 +113285,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("reference_arm64_standalone") {
--      cflags = []
+-    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("x32-transposec_arch=rv64gcv-abi=lp64d") {
++  source_set("xx-transposev_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-transposec/gen/x32-transposec-8xv1-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-8xv2-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-8xv4-rvv.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/reference/binary-elementwise.cc",
--        "src/src/reference/packing.cc",
--        "src/src/reference/unary-elementwise.cc",
+-        "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" ]
@@ -108745,7 +113331,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("s8-ibilinear_arm64") {
+-    source_set("x8-packq_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -108756,9 +113342,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
+-        "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -108770,21 +113355,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("xx-transposev_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-transposec/gen/x32-transposec-8xv1-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-8xv2-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-8xv4-rvv.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
  
 -      deps = [
@@ -108810,15 +113388,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-packq_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/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" ]
@@ -108845,13 +113422,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("s8-maxpool_arm64") {
+-    source_set("x8-packw_arm64") {
 -      cflags = []
--
++}
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c",
--        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c",
+-        "src/src/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" ]
@@ -108865,15 +113445,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++if (current_cpu == "ppc64") {
 +if (build_with_chromium) {
-+  source_set("x32-transposec_riscv64") {
++  source_set("bf16-f32-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -108886,7 +113467,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-packw_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -108897,8 +113478,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -108924,47 +113507,34 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("s8-rdminmax_arm64") {
+-    source_set("x8-transposec_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_riscv64_standalone") {
++  source_set("bf16-f32-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
  
 -      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//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/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c",
+-        "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -108972,55 +113542,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rdminmax_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("s8-rminmax_arm64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("x8-transposec_arm64_standalone") {
 -      cflags = []
--
++if (build_with_chromium) {
++  source_set("bf16-qs8-vcvt_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++    ]
+ 
 -      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/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" ]
@@ -109032,20 +113587,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
-+if (build_with_chromium) {
-+  source_set("x32-unpool_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
-+    ]
- 
+-
 -      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 -    }
 -  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109053,9 +113602,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rminmax_arm64_standalone") {
+-  if (build_with_chromium) {
+-    source_set("xx-copy_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -109066,65 +113614,42 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/xx-copy/xx-copy-scalar-memcpy.c",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/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("s8-vclamp_arm64") {
--      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-unpool_riscv64_standalone") {
++  source_set("bf16-qs8-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/s8-vclamp/s8-vclamp-neon-u64.c",
--        "src/src/s8-vclamp/s8-vclamp-scalar-u4.c",
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -109132,30 +113657,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_arm64_standalone") {
+-    source_set("xx-copy_arm64_standalone") {
 -      cflags = []
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      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/xx-copy/xx-copy-scalar-memcpy.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109175,58 +113685,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+if (build_with_chromium) {
-+  source_set("x64-transposec_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("subgraph_arm64") {
+-    source_set("xx-fill_arm64") {
 -      cflags = []
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/subgraph/argmax-pooling-2d.c",
--        "src/src/subgraph/average-pooling-2d.c",
--        "src/src/subgraph/batch-matrix-multiply.c",
--        "src/src/subgraph/binary.c",
--        "src/src/subgraph/concatenate.c",
--        "src/src/subgraph/convolution-2d.c",
--        "src/src/subgraph/copy.c",
--        "src/src/subgraph/deconvolution-2d.c",
--        "src/src/subgraph/deprecated.c",
--        "src/src/subgraph/depth-to-space-2d.c",
--        "src/src/subgraph/depthwise-convolution-2d.c",
--        "src/src/subgraph/even-split.c",
--        "src/src/subgraph/fully-connected-sparse.c",
--        "src/src/subgraph/fully-connected.c",
--        "src/src/subgraph/max-pooling-2d.c",
--        "src/src/subgraph/pack-lh.c",
--        "src/src/subgraph/reshape-helpers.c",
--        "src/src/subgraph/rope.c",
--        "src/src/subgraph/softmax.c",
--        "src/src/subgraph/space-to-depth-2d.c",
--        "src/src/subgraph/static-constant-pad.c",
--        "src/src/subgraph/static-reduce.c",
--        "src/src/subgraph/static-resize-bilinear-2d.c",
--        "src/src/subgraph/static-slice.c",
--        "src/src/subgraph/static-transpose.c",
--        "src/src/subgraph/subgraph-utils.c",
--        "src/src/subgraph/unary.c",
--        "src/src/subgraph/unpooling-2d.c",
--        "src/src/subgraph/validation.c",
+-        "src/src/xx-fill/xx-fill-neon-u64.c",
+-        "src/src/xx-fill/xx-fill-scalar-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109240,66 +113712,42 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  source_set("bf16-rminmax_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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("subgraph_arm64_standalone") {
+-    source_set("xx-fill_arm64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/subgraph/argmax-pooling-2d.c",
--        "src/src/subgraph/average-pooling-2d.c",
--        "src/src/subgraph/batch-matrix-multiply.c",
--        "src/src/subgraph/binary.c",
--        "src/src/subgraph/concatenate.c",
--        "src/src/subgraph/convolution-2d.c",
--        "src/src/subgraph/copy.c",
--        "src/src/subgraph/deconvolution-2d.c",
--        "src/src/subgraph/deprecated.c",
--        "src/src/subgraph/depth-to-space-2d.c",
--        "src/src/subgraph/depthwise-convolution-2d.c",
--        "src/src/subgraph/even-split.c",
--        "src/src/subgraph/fully-connected-sparse.c",
--        "src/src/subgraph/fully-connected.c",
--        "src/src/subgraph/max-pooling-2d.c",
--        "src/src/subgraph/pack-lh.c",
--        "src/src/subgraph/reshape-helpers.c",
--        "src/src/subgraph/rope.c",
--        "src/src/subgraph/softmax.c",
--        "src/src/subgraph/space-to-depth-2d.c",
--        "src/src/subgraph/static-constant-pad.c",
--        "src/src/subgraph/static-reduce.c",
--        "src/src/subgraph/static-resize-bilinear-2d.c",
--        "src/src/subgraph/static-slice.c",
--        "src/src/subgraph/static-transpose.c",
--        "src/src/subgraph/subgraph-utils.c",
--        "src/src/subgraph/unary.c",
--        "src/src/subgraph/unpooling-2d.c",
--        "src/src/subgraph/validation.c",
+-        "src/src/xx-fill/xx-fill-neon-u64.c",
+-        "src/src/xx-fill/xx-fill-scalar-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109320,40 +113768,48 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("tables_arm64") {
+-    source_set("xx-pad_arm64") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("bf16-rminmax_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"
 +    ]
  
 -      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/xx-pad/xx-pad-p16-neon-u16.c",
+-        "src/src/xx-pad/xx-pad-p4-scalar-u16.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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",
@@ -109371,30 +113827,46 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("xx-pad_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x8-lut_riscv64") {
++  source_set("configs_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/configs/argmaxpool-config.c",
++    "src/src/configs/avgpool-config.c",
++    "src/src/configs/binary-elementwise-config.c",
++    "src/src/configs/cmul-config.c",
++    "src/src/configs/conv-hwc2chw-config.c",
++    "src/src/configs/dwconv-config.c",
++    "src/src/configs/dwconv2d-chw-config.c",
++    "src/src/configs/gemm-config.c",
++    "src/src/configs/hardware-config.c",
++    "src/src/configs/ibilinear-chw-config.c",
++    "src/src/configs/ibilinear-config.c",
++    "src/src/configs/lut32norm-config.c",
++    "src/src/configs/maxpool-config.c",
++    "src/src/configs/pack-lh-config.c",
++    "src/src/configs/raddstoreexpminusmax-config.c",
++    "src/src/configs/reduce-config.c",
++    "src/src/configs/spmm-config.c",
++    "src/src/configs/transpose-config.c",
++    "src/src/configs/unary-elementwise-config.c",
++    "src/src/configs/unpool-config.c",
++    "src/src/configs/vmulcaddc-config.c",
++    "src/src/configs/x8-lut-config.c",
++    "src/src/configs/xx-fill-config.c",
++    "src/src/configs/xx-pad-config.c"
 +    ]
  
 -      sources = [
 -        "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/xx-pad/xx-pad-p16-neon-u16.c",
+-        "src/src/xx-pad/xx-pad-p4-scalar-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109422,7 +113894,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("u8-ibilinear_arm64") {
+-    source_set("xx-transposev_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -109433,9 +113905,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -109447,14 +113917,37 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("configs_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/configs/argmaxpool-config.c",
++    "src/src/configs/avgpool-config.c",
++    "src/src/configs/binary-elementwise-config.c",
++    "src/src/configs/cmul-config.c",
++    "src/src/configs/conv-hwc2chw-config.c",
++    "src/src/configs/dwconv-config.c",
++    "src/src/configs/dwconv2d-chw-config.c",
++    "src/src/configs/gemm-config.c",
++    "src/src/configs/hardware-config.c",
++    "src/src/configs/ibilinear-chw-config.c",
++    "src/src/configs/ibilinear-config.c",
++    "src/src/configs/lut32norm-config.c",
++    "src/src/configs/maxpool-config.c",
++    "src/src/configs/pack-lh-config.c",
++    "src/src/configs/raddstoreexpminusmax-config.c",
++    "src/src/configs/reduce-config.c",
++    "src/src/configs/spmm-config.c",
++    "src/src/configs/transpose-config.c",
++    "src/src/configs/unary-elementwise-config.c",
++    "src/src/configs/unpool-config.c",
++    "src/src/configs/vmulcaddc-config.c",
++    "src/src/configs/x8-lut-config.c",
++    "src/src/configs/xx-fill-config.c",
++    "src/src/configs/xx-pad-config.c"
 +    ]
  
 -      deps = [
@@ -109480,15 +113973,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("xx-transposev_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109512,15 +114003,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      assert_no_deps = [ "//base" ]
      }
    }
-+}
+ }
  
+-if (current_cpu == "riscv64") {
 -  if (build_with_chromium) {
--    source_set("u8-lut32norm_arm64") {
+-    source_set("bf16-f32-vcvt_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-lut32norm/u8-lut32norm-scalar.c",
+-        "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109535,14 +114027,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x8-packq_riscv64") {
++  source_set("enums_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/enums/allocation-type.c",
++    "src/src/enums/datatype-strings.c",
++    "src/src/enums/microkernel-type.c",
++    "src/src/enums/node-type.c",
++    "src/src/enums/operator-type.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -109555,7 +114051,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("bf16-f32-vcvt_riscv64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -109566,7 +114062,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-lut32norm/u8-lut32norm-scalar.c",
+-        "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109592,24 +114088,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("u8-maxpool_arm64") {
+-    source_set("bf16-qs8-vcvt_riscv64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packq_riscv64_standalone") {
++  source_set("enums_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.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/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
--        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.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" ]
@@ -109644,13 +114143,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("bf16-qs8-vcvt_riscv64_standalone") {
 -      cflags = []
--
++if (build_with_chromium) {
++  source_set("f16-f32-vcvt_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
--        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c",
+-        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109672,23 +114180,118 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("x8-packw_riscv64") {
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("bf16-rminmax_riscv64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32-vcvt_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/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("bf16-rminmax_riscv64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//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("u8-rdminmax_arm64") {
+-    source_set("configs_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" ]
@@ -109696,10 +114299,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -109728,29 +114351,46 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("configs_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packw_riscv64_standalone") {
++  source_set("f16-qs8-vcvt_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/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      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/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" ]
@@ -109778,7 +114418,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("u8-rminmax_arm64") {
+-    source_set("enums_riscv64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -109789,12 +114429,11 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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/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" ]
@@ -109819,27 +114458,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("enums_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x8-transposec_riscv64") {
++  source_set("f16-qu8-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      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/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" ]
@@ -109867,8 +114505,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("u8-vclamp_arm64") {
--      cflags = []
+-    source_set("f16-avgpool_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-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",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -109876,31 +114534,76 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
--        "src/src/u8-vclamp/u8-vclamp-scalar-u4.c",
--      ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-avgpool_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-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" ]
+-      }
+-    }
+-  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_riscv64_standalone") {
++  source_set("f16-qu8-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-dwconv/gen/f16-dwconv-25p8vc-minmax-rvvfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-3p8vc-minmax-rvvfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-4p8vc-minmax-rvvfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-9p8vc-minmax-rvvfp16arith.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -109924,14 +114627,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("u8-vclamp_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-    source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/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" ]
@@ -109951,6 +114658,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
      }
@@ -109958,15 +114667,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-    source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
 -
 -      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/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109981,14 +114690,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("xx-copy_riscv64") {
++  source_set("f16-rdminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.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" ]
@@ -110001,21 +114711,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110036,29 +114740,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-packw_arm64") {
+-    source_set("f16-f32-vcvt_riscv64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-copy_riscv64_standalone") {
++  source_set("f16-rdminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.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/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/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -110093,23 +114804,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-f32-vcvt_riscv64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("xx-fill_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.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-x8-gemm-goi-neon-ld4lane-u8-prfm.c",
+-        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110131,46 +114831,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("x16-transposec_arm64") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++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-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.c",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("xx-fill_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -110189,19 +114879,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-transposec_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-    source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110221,20 +114912,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x16-x32-packw_arm64") {
--      cflags = []
+-    source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
 -
 -      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/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110248,15 +114940,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("xx-pad_riscv64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -110269,19 +114964,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110302,47 +114993,31 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("x24-transposec_arm64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("xx-pad_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -110360,24 +115035,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x24-transposec_arm64_standalone") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("xx-transposev_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
-+    ]
- 
+-    source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110398,43 +115064,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-pack-lh_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("xx-transposev_riscv64_standalone") {
+-  }
++if (build_with_chromium) {
++  source_set("f16-vapproxgelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110460,21 +115111,20 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-    source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110494,30 +115144,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-packw_arm64") {
--      cflags = []
-+}
- 
+-    source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/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" ]
@@ -110531,16 +115173,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (current_cpu == "ppc64") {
-+if (build_with_chromium) {
-+  source_set("bf16-f32-vcvt_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vapproxgelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -110553,28 +115195,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x32-packw_arm64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/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" ]
@@ -110595,47 +115225,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("x32-transposec_arm64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("bf16-f32-vcvt_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/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" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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",
@@ -110653,24 +115268,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x32-transposec_arm64_standalone") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("bf16-qs8-vcvt_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
-+    ]
- 
+-    source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/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" ]
@@ -110691,94 +115298,67 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x32-unpool_arm64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("bf16-qs8-vcvt_ppc64_standalone") {
+-  }
++if (build_with_chromium) {
++  source_set("f16-vcos_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/x32-unpool/x32-unpool-neon.c",
--        "src/src/x32-unpool/x32-unpool-scalar.c",
+-  if (build_with_chromium) {
+-    source_set("f16-maxpool_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
 -      ]
-+    configs -= [ "//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-maxpool/gen/f16-maxpool-9p-minmax-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",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x32-unpool_arm64_standalone") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("bf16-rminmax_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"
-+    ]
- 
+-    source_set("f16-maxpool_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/x32-unpool/x32-unpool-neon.c",
--        "src/src/x32-unpool/x32-unpool-scalar.c",
+-        "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110799,48 +115379,33 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x64-transposec_arm64") {
+-    source_set("f16-qs8-vcvt_riscv64") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-
 -      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/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-rminmax_ppc64_standalone") {
++  source_set("f16-vcos_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/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
  
 -      deps = [
@@ -110866,15 +115431,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-qs8-vcvt_riscv64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110901,46 +115464,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("x8-lut_arm64") {
+-    source_set("f16-qu8-vcvt_riscv64") {
 -      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/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("configs_ppc64") {
++  source_set("f16-vexp_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/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110973,47 +115512,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-qu8-vcvt_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("configs_ppc64_standalone") {
++  source_set("f16-vexp_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/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -      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/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111041,68 +115556,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--      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",
+-    source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
 -      ]
 -
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_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("x8-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
-+if (build_with_chromium) {
-+  source_set("enums_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"
-+    ]
- 
 -      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/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111114,91 +115576,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
--      }
--    }
--  }
-+    configs -= [ "//build/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("x8-packq_arm64") {
--      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
--        "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("enums_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"
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x8-packq_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-    source_set(
+-        "f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111225,15 +115628,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("x8-packw_arm64") {
--      cflags = []
+-    source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
 -
 -      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/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" ]
@@ -111248,14 +115652,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_ppc64") {
++  source_set("f16-vgelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -111268,21 +115672,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("x8-packw_arm64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/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" ]
@@ -111303,29 +115702,36 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("x8-transposec_arm64") {
+-    source_set("f16-rdminmax_riscv64") {
 -      cflags = []
 +# 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-vgelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      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/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
+-        "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -111360,23 +115766,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-rdminmax_riscv64_standalone") {
 -      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"
-+    ]
- 
+-
 -      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/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" ]
@@ -111398,108 +115794,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("xx-copy_arm64") {
--      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" ]
-+  }
-+}
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_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-qs8-vcvt_ppc64_standalone") {
++if (build_with_chromium) {
++  source_set("f16-vlog_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
-+    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("xx-copy_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/xx-copy/xx-copy-scalar-memcpy.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
 -  if (build_with_chromium) {
--    source_set("xx-fill_arm64") {
--      cflags = []
+-    source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
 -
 -      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/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" ]
@@ -111513,29 +115830,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//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("xx-fill_arm64_standalone") {
--      cflags = []
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -111543,10 +115845,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/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" ]
@@ -111572,24 +115883,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("xx-pad_arm64") {
+-    source_set("f16-rminmax_riscv64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qu8-vcvt_ppc64_standalone") {
++  source_set("f16-vlog_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c"
 +    ]
  
 -      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/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" ]
@@ -111624,24 +115936,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-rminmax_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_ppc64") {
++  source_set("f16-vsin_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"
++      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -      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/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" ]
@@ -111662,93 +115974,141 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-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" ]
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("xx-transposev_arm64") {
--      cflags = []
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      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-rdminmax_ppc64_standalone") {
++  source_set("f16-vsin_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-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
+-        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-u2v.c",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("xx-transposev_arm64_standalone") {
--      cflags = []
-+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"
-+    ]
- 
+-    source_set("f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
+-        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111768,60 +116128,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
- }
++}
  
--if (current_cpu == "riscv64") {
 -  if (build_with_chromium) {
--    source_set("bf16-f32-vcvt_riscv64") {
+-    source_set("f16-vapproxgelu_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_ppc64_standalone") {
+-
+-      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") {
 +    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-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -111829,33 +116170,38 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("bf16-f32-vcvt_riscv64_standalone") {
+-    source_set("f16-vapproxgelu_riscv64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_ppc64") {
++# 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-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c",
+-        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111883,53 +116229,46 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("bf16-qs8-vcvt_riscv64") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f16-vbinary/gen/f16-vadd-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vaddc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vdiv-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vdivc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vmax-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vmaxc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vmin-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vminc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vmul-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vmulc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vprelu-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vpreluc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vrdivc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vrpreluc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vrsubc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vsqrdiff-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vsqrdiffc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vsub-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vsubc-rvvfp16arith-u8v.c",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -111937,15 +116276,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("bf16-qs8-vcvt_riscv64_standalone") {
--      cflags = []
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    public_configs = [ ":xnnpack_public_config" ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f16-vbinary/gen/f16-vadd-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vaddc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vdiv-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vdivc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vmax-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vmaxc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vmin-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vminc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vmul-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vmulc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vprelu-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vpreluc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vrdivc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vrpreluc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vrsubc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vsqrdiff-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vsqrdiffc-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vsub-rvvfp16arith-u8v.c",
+-        "src/src/f16-vbinary/gen/f16-vsubc-rvvfp16arith-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111972,35 +116336,97 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("bf16-rminmax_riscv64") {
--      cflags = []
+-    source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
 -
 -      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/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" ]
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f16-vcos_ppc64") {
++  source_set("f16-vtanh_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
 +    ]
  
+-  # 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" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/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-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",
@@ -112022,25 +116448,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("bf16-rminmax_riscv64_standalone") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
-+    ]
- 
+-    source_set("f16-vcmul_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      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/f16-vcmul/gen/f16-vcmul-rvvfp16arith-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112062,47 +116478,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("configs_riscv64") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vtanh_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c"
 +    ]
  
+-  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/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/f16-vcos/gen/f16-vcos-rvvfp16arith-rational-3-2-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112116,46 +116513,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("configs_riscv64_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",
+-    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" ]
@@ -112175,41 +116558,42 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vexp_ppc64") {
++  source_set("f32-argmaxpool_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("enums_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" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/enums/allocation-type.c",
--        "src/src/enums/datatype-strings.c",
--        "src/src/enums/microkernel-type.c",
--        "src/src/enums/node-type.c",
--        "src/src/enums/operator-type.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -112231,27 +116615,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vcos_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_ppc64_standalone") {
++  source_set("f32-argmaxpool_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -      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-vcos/gen/f16-vcos-scalar-rational-3-2-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112279,7 +116659,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f16-velu_arch=rv64gc_zvfh-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -112287,10 +116667,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-dwconv/gen/f16-dwconv-25p8vc-minmax-rvvfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-3p8vc-minmax-rvvfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-4p8vc-minmax-rvvfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p8vc-minmax-rvvfp16arith.c",
+-        "src/src/f16-velu/gen/f16-velu-rvvfp16arith-rr1-p3-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112318,7 +116695,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-velu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -112326,10 +116703,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-dwconv/gen/f16-dwconv-25p8vc-minmax-rvvfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-3p8vc-minmax-rvvfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-4p8vc-minmax-rvvfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p8vc-minmax-rvvfp16arith.c",
+-        "src/src/f16-velu/gen/f16-velu-rvvfp16arith-rr1-p3-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112356,7 +116730,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f16-vexp_arch=rv64gc_zvfh-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -112364,7 +116738,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c",
+-        "src/src/f16-vexp/gen/f16-vexp-rvvfp16arith-poly-3-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112379,14 +116753,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_ppc64") {
++  source_set("f32-avgpool_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -112399,7 +116773,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vexp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -112407,7 +116781,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c",
+-        "src/src/f16-vexp/gen/f16-vexp-rvvfp16arith-poly-3-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112440,23 +116814,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-f32-vcvt_riscv64") {
+-    source_set("f16-vexp_riscv64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_ppc64_standalone") {
++  source_set("f32-avgpool_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
+-        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -112491,22 +116865,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vexp_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-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
+-        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112528,13 +116892,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-bf16-vcvt_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++    ]
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f16-vgelu_arch=rv64gc_zvfh-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -112542,7 +116912,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.c",
+-        "src/src/f16-vgelu/gen/f16-vgelu-rvvfp16arith-rational-6-4-div-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112556,6 +116926,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -112563,15 +116941,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-    source_set("f16-vgelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -112579,7 +116951,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.c",
+-        "src/src/f16-vgelu/gen/f16-vgelu-rvvfp16arith-rational-6-4-div-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112600,68 +116972,68 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  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("f16-vsin_ppc64_standalone") {
++  source_set("f32-bf16-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.c",
+-        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
+-    source_set("f16-vgelu_riscv64_standalone") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.c",
+-        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112681,16 +117053,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++if (build_with_chromium) {
++  source_set("f32-conv-hwc2chw_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-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -112698,7 +117075,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c",
+-        "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112712,28 +117089,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-argmaxpool_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-    source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -112741,7 +117114,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c",
+-        "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112762,92 +117135,38 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-    source_set("f16-vlog_riscv64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_ppc64_standalone") {
++  source_set("f32-conv-hwc2chw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      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" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -112855,24 +117174,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  if (build_with_chromium) {
--    source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
--        "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -112890,16 +117191,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
+-    source_set("f16-vlog_riscv64_standalone") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
--        "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.c",
+-        "src/src/f16-vlog/gen/f16-vlog-scalar-rational-3-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112922,18 +117219,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_ppc64") {
++  source_set("f32-dwconv2d-chw_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -112941,8 +117245,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-igemm/gen/f16-igemm-1x4v-minmax-rvvfp16arith.c",
--        "src/src/f16-igemm/gen/f16-igemm-7x4v-minmax-rvvfp16arith.c",
+-        "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112973,7 +117276,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -112981,8 +117284,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-igemm/gen/f16-igemm-1x4v-minmax-rvvfp16arith.c",
--        "src/src/f16-igemm/gen/f16-igemm-7x4v-minmax-rvvfp16arith.c",
+-        "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113008,73 +117310,66 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-qs8-vcvt_riscv64") {
--      cflags = []
-+# 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"
-+    ]
- 
+-    source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f16-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" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-qs8-vcvt_riscv64_standalone") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-dwconv2d-chw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-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"
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_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-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c4v-minmax-rvvfp16arith-2x.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113095,57 +117390,34 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
--    source_set("f16-qu8-vcvt_riscv64") {
--      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"
-+    ]
- 
+-    source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f16-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" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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",
@@ -113163,22 +117435,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
-+    ]
- 
+-    source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f16-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" ]
@@ -113200,13 +117468,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
++    ]
  
 -  if (build_with_chromium) {
--    source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -113214,7 +117497,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c",
+-        "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113228,6 +117511,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
@@ -113235,16 +117526,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set(
--        "f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-    source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -113252,7 +117536,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c",
+-        "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113273,21 +117557,61 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  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-conv-hwc2chw_ppc64_standalone") {
++  source_set("f32-dwconv_ppc64_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"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d") {
+-  # 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",
@@ -113295,8 +117619,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
--        "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c",
+-        "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113308,16 +117631,44 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-  if (build_with_chromium) {
+-    source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vsin/gen/f16-vsin-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",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -113325,9 +117676,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-    source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -113335,8 +117691,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
--        "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c",
+-        "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-rational-3-2-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113356,8 +117711,6 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
      }
@@ -113365,30 +117718,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-rdminmax_riscv64") {
+-    source_set("f16-vsin_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
--        "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c",
+-        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_ppc64") {
++  source_set("f32-f16-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113421,31 +117766,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsin_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_ppc64_standalone") {
++  source_set("f32-f16-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
--        "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c",
+-        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113473,7 +117810,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -113481,9 +117818,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113511,7 +117846,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -113519,9 +117854,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113548,33 +117881,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-rminmax_riscv64") {
+-    source_set("f16-vsqrt_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
--        "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
--        "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_ppc64") {
++  source_set("f32-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113607,34 +117934,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vsqrt_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_ppc64_standalone") {
++  source_set("f32-gemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/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-vsqrt/gen/f16-vsqrt-scalar-sqrt.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113662,7 +117983,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f16-vtanh_arch=rv64gc_zvfh-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -113670,7 +117991,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-expm1minus-rr1-p3h2ts-div-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113698,7 +118019,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vtanh_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -113706,7 +118027,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-expm1minus-rr1-p3h2ts-div-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113733,22 +118054,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vapproxgelu_riscv64") {
+-    source_set("f16-vtanh_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_ppc64") {
++  source_set("f32-ibilinear-chw_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113781,23 +118102,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vtanh_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_ppc64_standalone") {
++  source_set("f32-ibilinear-chw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-scalar-expm1minus-rr1-p3h2ts-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113824,34 +118145,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  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",
+-  if (build_with_chromium) {
+-    source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d") {
+-      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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113879,7 +118184,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vunary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gc_zvfh",
@@ -113887,25 +118192,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113932,15 +118221,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
+-        "-march=rv64gcv",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113955,19 +118244,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-gemm_ppc64") {
++  source_set("f32-ibilinear_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -113980,15 +118264,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
+-        "-march=rv64gcv",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114021,28 +118305,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vcos_riscv64") {
+-    source_set("f32-argmaxpool_riscv64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_ppc64_standalone") {
++  source_set("f32-ibilinear_ppc64_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-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -114077,22 +118356,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-argmaxpool_riscv64_standalone") {
 -      cflags = []
-+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"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114113,90 +118382,72 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f16-vexp_riscv64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear-chw_ppc64_standalone") {
+-  }
++if (build_with_chromium) {
++  source_set("f32-igemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.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) {
+-    source_set("f32-avgpool_arch=rv64gcv-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vexp_riscv64_standalone") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-ibilinear_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
-+    ]
- 
+-    source_set("f32-avgpool_arch=rv64gcv-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114217,44 +118468,38 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vgelu_riscv64") {
+-    source_set("f32-avgpool_riscv64") {
 -      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",
+-        "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" ]
 +# 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"
 +    ]
  
 -      deps = [
@@ -114280,13 +118525,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vgelu_riscv64_standalone") {
+-    source_set("f32-avgpool_riscv64_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",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114313,153 +118558,71 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
+-    source_set("f32-bf16-vcvt_riscv64") {
+-      cflags = []
 -
 -      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",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
 -      ]
 +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"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_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_arch=rv64gc_zvfh-abi=lp64d_standalone") {
--      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:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
--  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",
--      ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-bf16-vcvt_riscv64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_ppc64_standalone") {
++  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"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_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-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",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114481,26 +118644,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
+-        "-march=rv64gcv",
 -      ]
 -
 -      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/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114514,29 +118672,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-    source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
+-        "-march=rv64gcv",
 -      ]
 -
 -      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/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114556,148 +118714,67 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-conv-hwc2chw_riscv64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_ppc64") {
++  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"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
--      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" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f16-vsin_riscv64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-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",
++      "//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 (!(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") {
+-    source_set("f32-conv-hwc2chw_riscv64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-qc4w-gemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
@@ -114710,7 +118787,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114738,15 +118815,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d") {
+-    source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
+-        "-march=rv64gcv",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114764,26 +118842,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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) {
--    source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-    source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
+-        "-march=rv64gcv",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114803,33 +118881,37 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc4w-gemm_ppc64_standalone") {
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-dwconv2d-chw_riscv64") {
+-      cflags = []
++if (build_with_chromium) {
++  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"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d") {
--      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-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114850,27 +118932,44 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
--
+-    source_set("f32-dwconv2d-chw_riscv64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-qc8w-gemm_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"
++    ]
+ 
 -      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-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
+-        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114890,16 +118989,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -114907,7 +119005,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114921,29 +119026,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_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"
++    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) {
--    source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -114951,7 +119048,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114971,75 +119075,77 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-argmaxpool_riscv64") {
+-    source_set("f32-dwconv_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_ppc64_standalone") {
++if (build_with_chromium) {
++  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 = [
--        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c",
+-      ]
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    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" ]
++    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" ]
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-argmaxpool_riscv64_standalone") {
+-    source_set("f32-dwconv_riscv64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-qs8-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
@@ -115052,7 +119158,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
+-        "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -115080,54 +119195,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-avgpool_riscv64") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
+-        "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-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"
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -115135,15 +119224,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-avgpool_riscv64_standalone") {
--      cflags = []
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    public_configs = [ ":xnnpack_public_config" ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gc_zvfh",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
+-        "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -115170,12 +119266,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-bf16-vcvt_riscv64") {
+-    source_set("f32-f16-vcvt_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
+-        "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c",
 -      ]
 +if (build_with_chromium) {
 +  source_set("f32-qu8-vcvt_ppc64") {
@@ -115219,7 +119315,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f16-vcvt_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -115236,7 +119332,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
+-        "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -115264,7 +119360,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -115272,7 +119368,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.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" ]
@@ -115300,7 +119397,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # 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-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -115308,7 +119405,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.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" ]
@@ -115335,12 +119433,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-conv-hwc2chw_riscv64") {
+-    source_set("f32-gemm_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
+-        "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
+-        "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
+-        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
+-        "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
+-        "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
+-        "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
 +  source_set("f32-raddstoreexpminusmax_ppc64") {
@@ -115353,21 +119468,155 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-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("f32-gemm_riscv64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
+-        "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
+-        "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
+-        "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
+-        "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
+-        "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c",
+-      ]
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/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-ibilinear-chw_riscv64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-raddstoreexpminusmax_ppc64_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/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: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-ibilinear-chw_riscv64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("f32-rdminmax_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"
++    ]
+ 
+-      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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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-ibilinear_riscv64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -115375,31 +119624,61 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-rdminmax_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"
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_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-conv-hwc2chw_riscv64_standalone") {
+-    source_set("f32-ibilinear_riscv64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
+-        "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -115419,15 +119698,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-igemm_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -115435,8 +119713,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c",
+-        "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
+-        "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -115450,21 +119728,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++if (build_with_chromium) {
++  source_set("f32-rdsum2_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
 -  }
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # 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-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -115472,8 +119757,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
--        "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c",
+-        "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
+-        "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -115493,37 +119778,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-dwconv2d-chw_riscv64") {
+-    source_set("f32-igemm_riscv64") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-rdminmax_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  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"
 +    ]
  
 -      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-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" ]
@@ -115544,44 +119833,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-dwconv2d-chw_riscv64_standalone") {
+-    source_set("f32-igemm_riscv64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      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-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" ]
@@ -115601,15 +119874,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -115617,14 +119889,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -115638,21 +119903,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++if (build_with_chromium) {
++  source_set("f32-rdsum_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
 -  }
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # 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-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -115660,14 +119932,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -115687,97 +119952,88 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-dwconv_riscv64") {
+-    source_set("f32-maxpool_riscv64") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-rdsum2_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  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 = [
 -        "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-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-dwconv_riscv64_standalone") {
+-    source_set("f32-maxpool_riscv64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_ppc64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-rminmax_ppc64") {
 +    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 = [
 -        "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-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -115805,28 +120061,56 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
--
+-    source_set("f32-qc4w-gemm_riscv64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c",
+-        "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
+-        "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-rminmax_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"
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -115834,22 +120118,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    public_configs = [ ":xnnpack_public_config" ]
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gc_zvfh",
--      ]
--
+-    source_set("f32-qc4w-gemm_riscv64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.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" ]
@@ -115876,22 +120154,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-f16-vcvt_riscv64") {
+-    source_set("f32-qc8w-gemm_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c",
+-        "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
+-        "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_ppc64") {
++  source_set("f32-rsum2_ppc64") {
 +    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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -115924,23 +120203,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # 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-qc8w-gemm_riscv64_standalone") {
 -      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-rsum2_ppc64_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"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.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" ]
@@ -115968,7 +120248,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -115976,8 +120256,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116005,7 +120284,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # 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-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -116013,8 +120292,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116041,55 +120319,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-gemm_riscv64") {
+-    source_set("f32-qs8-vcvt_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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//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-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_ppc64") {
++  source_set("f32-rsum_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-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-gemm_riscv64_standalone") {
--      cflags = []
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -116097,14 +120360,32 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("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-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-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" ]
@@ -116125,80 +120406,58 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f32-ibilinear-chw_riscv64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_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"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c",
--      ]
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-  if (build_with_chromium) {
+-    source_set("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:pthreadpool_standalone",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-ibilinear-chw_riscv64_standalone") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-rsum2_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
-+    ]
- 
+-    source_set("f32-qu8-vcvt_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-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116218,77 +120477,84 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("f32-ibilinear_riscv64") {
+-    source_set("f32-qu8-vcvt_riscv64") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c",
+-        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_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-rsum2_ppc64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-spmm_ppc64") {
 +    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"
 +    ]
  
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-ibilinear_riscv64_standalone") {
+-    source_set("f32-qu8-vcvt_riscv64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-spmm_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c",
+-        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
+-        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116308,14 +120574,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-igemm_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -116323,8 +120590,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116338,28 +120604,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+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"
++    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) {
--    source_set("f32-igemm_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -116367,8 +120626,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116388,83 +120646,78 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-igemm_riscv64") {
+-    source_set("f32-raddstoreexpminusmax_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-vapproxgelu_ppc64") {
 +    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 = [
--        "src/include/xnnpack.h",
--        "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
--        "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-igemm_riscv64_standalone") {
+-    source_set("f32-raddstoreexpminusmax_riscv64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vapproxgelu_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++    ]
  
 -      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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116484,14 +120737,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-maxpool_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -116499,7 +120753,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116513,30 +120768,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-spmm_ppc64") {
-+    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"
++    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) {
--    source_set("f32-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -116544,7 +120790,8 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116564,54 +120811,58 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-maxpool_riscv64") {
+-    source_set("f32-rdminmax_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_ppc64_standalone") {
+-
+-      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-vbinary_ppc64") {
 +    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/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool: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",
@@ -116619,33 +120870,57 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-maxpool_riscv64_standalone") {
+-    source_set("f32-rdminmax_riscv64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vbinary_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.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/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.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" ]
@@ -116673,54 +120948,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-qc4w-gemm_riscv64") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("f32-rdsum2_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -116728,16 +120977,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-qc4w-gemm_riscv64_standalone") {
--      cflags = []
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    public_configs = [ ":xnnpack_public_config" ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-rdsum2_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116764,41 +121019,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-qc8w-gemm_riscv64") {
+-    source_set("f32-rdsum2_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
--        "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c",
+-        "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_ppc64") {
++  source_set("f32-vclamp_ppc64") {
 +    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-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116831,42 +121067,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-qc8w-gemm_riscv64_standalone") {
+-    source_set("f32-rdsum2_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_ppc64_standalone") {
++  source_set("f32-vclamp_ppc64_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-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      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-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116894,7 +121111,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-rdsum_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -116902,7 +121119,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c",
+-        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116930,7 +121147,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -116938,7 +121155,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c",
+-        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -116965,23 +121182,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-qs8-vcvt_riscv64") {
+-    source_set("f32-rdsum_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
--        "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c",
+-        "src/src/f32-rdsum/gen/f32-rdsum-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" ]
@@ -117014,24 +121230,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-qs8-vcvt_riscv64_standalone") {
+-    source_set("f32-rdsum_riscv64_standalone") {
 -      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 = [
 -        "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-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117059,7 +121274,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -117067,7 +121282,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.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" ]
@@ -117095,7 +121312,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -117103,7 +121320,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.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" ]
@@ -117130,23 +121349,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-qu8-vcvt_riscv64") {
+-    source_set("f32-rminmax_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-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",
 -      ]
 +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" ]
@@ -117179,24 +121401,27 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rminmax_riscv64_standalone") {
 -      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 = [
 -        "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-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" ]
@@ -117224,7 +121449,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-rsum2_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -117232,7 +121457,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c",
+-        "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117260,7 +121485,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum2_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -117268,7 +121493,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c",
+-        "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117295,24 +121520,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-raddstoreexpminusmax_riscv64") {
+-    source_set("f32-rsum2_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c",
+-        "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.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" ]
@@ -117345,25 +121568,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum2_riscv64_standalone") {
 -      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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c",
+-        "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117391,7 +121612,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-rsum_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -117399,8 +121620,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum/gen/f32-rsum-rvv-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117428,7 +121648,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -117436,8 +121656,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum/gen/f32-rsum-rvv-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117464,23 +121683,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-rdminmax_riscv64") {
+-    source_set("f32-rsum_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-rsum/gen/f32-rsum-scalar-u4-acc4.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" ]
@@ -117513,24 +121731,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_riscv64_standalone") {
 -      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 = [
 -        "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-rsum/gen/f32-rsum-scalar-u4-acc4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117558,7 +121775,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-spmm_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -117566,7 +121783,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-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" ]
@@ -117594,7 +121813,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # 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-spmm_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -117602,7 +121821,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-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" ]
@@ -117629,22 +121850,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-rdsum2_riscv64") {
+-    source_set("f32-spmm_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.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",
 -      ]
 +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" ]
@@ -117677,23 +121900,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-rdsum2_riscv64_standalone") {
+-    source_set("f32-spmm_riscv64_standalone") {
 -      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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.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" ]
@@ -117721,7 +121946,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-rdsum_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-vapproxgelu_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -117729,7 +121954,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c",
+-        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117757,7 +121982,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-vapproxgelu_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -117765,7 +121990,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c",
+-        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117792,22 +122017,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-rdsum_riscv64") {
+-    source_set("f32-vapproxgelu_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c",
+-        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.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" ]
@@ -117840,23 +122065,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vapproxgelu_riscv64_standalone") {
 -      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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c",
+-        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117884,7 +122109,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -117892,9 +122117,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vbinary/gen/f32-vadd-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vprelu-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vpreluc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vrpreluc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117922,7 +122163,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # 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-vbinary_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -117930,9 +122171,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vbinary/gen/f32-vadd-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vprelu-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vpreluc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vrpreluc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c",
+-        "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -117959,35 +122216,52 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-rminmax_riscv64") {
+-    source_set("f32-vbinary_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",
--      ]
 +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" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
++
 +    configs -= [ "//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",
+-        "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",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -118009,25 +122283,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-rminmax_riscv64_standalone") {
+-    source_set("f32-vbinary_riscv64_standalone") {
 -      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 = [
 -        "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-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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118055,7 +122345,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-rsum2_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-vclamp_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -118063,7 +122353,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c",
+-        "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118091,7 +122381,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # 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-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -118099,7 +122389,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c",
+-        "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118126,22 +122416,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-rsum2_riscv64") {
+-    source_set("f32-vclamp_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c",
+-        "src/src/f32-vclamp/gen/f32-vclamp-scalar.c",
 -      ]
 +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" ]
@@ -118174,23 +122464,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-rsum2_riscv64_standalone") {
+-    source_set("f32-vclamp_riscv64_standalone") {
 -      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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c",
+-        "src/src/f32-vclamp/gen/f32-vclamp-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118218,7 +122508,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-rsum_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-vcmul_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -118226,7 +122516,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c",
+-        "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118254,7 +122544,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # 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-vcmul_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -118262,7 +122552,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c",
+-        "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118289,22 +122579,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-rsum_riscv64") {
+-    source_set("f32-vcmul_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c",
+-        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.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" ]
@@ -118337,23 +122627,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-rsum_riscv64_standalone") {
+-    source_set("f32-vcmul_riscv64_standalone") {
 -      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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c",
+-        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118381,7 +122671,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-spmm_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -118389,9 +122679,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcopysign/gen/f32-vcopysign-rvv-u8v.c",
+-        "src/src/f32-vcopysign/gen/f32-vcopysignc-rvv-u8v.c",
+-        "src/src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118419,7 +122709,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # 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-vcopysign_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -118427,9 +122717,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcopysign/gen/f32-vcopysign-rvv-u8v.c",
+-        "src/src/f32-vcopysign/gen/f32-vcopysignc-rvv-u8v.c",
+-        "src/src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118456,50 +122746,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-spmm_riscv64") {
+-    source_set("f32-vcopysign_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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//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-vcopysign/gen/f32-vcopysign-scalar.c",
+-        "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
+-        "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("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"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_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") {
--      cflags = []
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -118507,93 +122788,33 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      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",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/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-vapproxgelu_riscv64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vcopysign_riscv64_standalone") {
 -      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"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/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-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && 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-vapproxgelu_riscv64_standalone") {
--      cflags = []
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c",
+-        "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
+-        "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
+-        "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118615,19 +122836,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_ppc64") {
-+    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" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-vcos_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -118635,25 +122850,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vprelu-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vpreluc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vrpreluc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c",
+-        "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118667,24 +122864,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vbinary_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-vcos_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -118692,25 +122886,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vprelu-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vpreluc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vrpreluc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c",
--        "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c",
+-        "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118730,102 +122906,84 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vbinary_riscv64") {
+-    source_set("f32-vcos_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vmulcaddc_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c",
+-      ]
++if (build_with_chromium) {
++  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"
 +    ]
  
--      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",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vbinary_riscv64_standalone") {
+-    source_set("f32-vcos_riscv64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vrnd_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"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
--        "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
--        "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
--        "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
--        "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c",
+-        "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118845,14 +123003,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-velu_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -118860,7 +123019,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c",
+-        "src/src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118874,31 +123033,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-vrnd_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"
++    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) {
--    source_set("f32-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-velu_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -118906,7 +123055,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c",
+-        "src/src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118926,55 +123075,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_riscv64") {
+-    source_set("f32-velu_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c",
+-      ]
++if (build_with_chromium) {
++  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"
 +    ]
  
--      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",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -118982,23 +123116,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vclamp_riscv64_standalone") {
+-    source_set("f32-velu_riscv64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vrsqrt_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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vclamp/gen/f32-vclamp-scalar.c",
+-        "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119020,20 +123170,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-vrsqrt_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"
-+    ]
++    configs -= [ "//build/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-vcmul_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-vexp_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -119041,7 +123184,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c",
+-        "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119055,24 +123198,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcmul_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-vexp_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -119080,7 +123220,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c",
+-        "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119100,46 +123240,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcmul_riscv64") {
+-    source_set("f32-vexp_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c",
+-      ]
++if (build_with_chromium) {
++  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"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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",
@@ -119147,23 +123280,38 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vcmul_riscv64_standalone") {
+-    source_set("f32-vexp_riscv64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vsigmoid_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
+-        "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119185,19 +123333,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-vsigmoid_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-vgelu_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -119205,9 +123347,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119221,24 +123361,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcopysign_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-vgelu_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -119246,9 +123383,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119268,47 +123403,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcopysign_riscv64") {
+-    source_set("f32-vgelu_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c",
+-      ]
++if (build_with_chromium) {
++  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"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
--        "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
--        "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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",
@@ -119316,21 +123443,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vcopysign_riscv64_standalone") {
+-    source_set("f32-vgelu_riscv64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-vsin_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vsin_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
@@ -119342,9 +123474,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
--        "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
--        "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c",
+-        "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119372,69 +123502,142 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vcos_riscv64") {
--      cflags = []
+-    source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vhswish/gen/f32-vhswish-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",
++      "//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-vhswish_arch=rv64gcv-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c",
+-        "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_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-vsin_ppc64_standalone") {
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//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-vhswish_riscv64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vhswish/gen/f32-vhswish-scalar.c",
+-      ]
++if (build_with_chromium) {
++  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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-vcos_riscv64_standalone") {
+-    source_set("f32-vhswish_riscv64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vsqrt_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c",
+-        "src/src/f32-vhswish/gen/f32-vhswish-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119454,19 +123657,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-velu_riscv64") {
--      cflags = []
+-    source_set("f32-vlog_arch=rv64gcv-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c",
+-        "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119480,39 +123687,29 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-vsqrt_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.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) {
--    source_set("f32-velu_riscv64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("f32-vlog_arch=rv64gcv-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c",
+-        "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119532,45 +123729,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vexp_riscv64") {
+-    source_set("f32-vlog_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "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-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -119578,21 +123769,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vexp_riscv64_standalone") {
+-    source_set("f32-vlog_riscv64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-vtanh_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vtanh_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
@@ -119604,7 +123800,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c",
+-        "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119632,53 +123828,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vgelu_riscv64") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -119686,15 +123857,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vgelu_riscv64_standalone") {
--      cflags = []
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    public_configs = [ ":xnnpack_public_config" ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119721,27 +123899,12 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gcv",
--      ]
+-    source_set("f32-vlrelu_riscv64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vhswish/gen/f32-vhswish-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",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
 +  source_set("f32-vunary_ppc64") {
@@ -119756,58 +123919,37 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vhswish_arch=rv64gcv-abi=lp64d_standalone") {
--      cflags = [
--        "-mabi=lp64d",
--        "-march=rv64gcv",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vhswish/gen/f32-vhswish-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",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("f32-vhswish_riscv64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vlrelu_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -119825,17 +123967,56 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vhswish/gen/f32-vhswish-scalar.c",
+-        "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",
@@ -119843,25 +124024,55 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-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",
+-        "//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("f32-vhswish_riscv64_standalone") {
+-  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("operators_ppc64") {
 +    cflags = [
@@ -119895,38 +124106,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    "src/src/operators/unpooling-nhwc.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vhswish/gen/f32-vhswish-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("f32-vlog_riscv64") {
--      cflags = []
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -119934,18 +124128,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c",
--      ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  # 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("operators_ppc64_standalone") {
@@ -119980,36 +124172,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    "src/src/operators/unpooling-nhwc.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vlog_riscv64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
 -      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" ]
@@ -120029,14 +124194,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlrelu_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-vrnd_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -120044,7 +124210,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120058,28 +124227,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+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"
++    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) {
--    source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-vrnd_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -120087,7 +124249,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120107,24 +124272,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlrelu_riscv64") {
+-    source_set("f32-vrnd_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc2w-gemm_ppc64_standalone") {
++if (build_with_chromium) {
++  source_set("qd8-f16-qc2w-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
@@ -120136,47 +124294,63 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  # 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 = []
--
++# 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-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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120198,20 +124372,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-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"
-+    ]
++    configs -= [ "//build/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") {
+-    source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -120219,7 +124386,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120232,25 +124399,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-vmulcaddc_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -120258,7 +124422,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120278,17 +124442,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vmulcaddc_riscv64") {
+-    source_set("f32-vrsqrt_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_ppc64_standalone") {
+-
+-      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("qd8-f32-qb4w-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
@@ -120299,25 +124469,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -120325,23 +124484,40 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
 -  # 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 = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qd8-f32-qb4w-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"
++    ]
+ 
 -      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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120363,19 +124539,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_ppc64") {
-+    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" ]
  
 -  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",
@@ -120383,10 +124553,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120400,24 +124567,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vrnd_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-vsigmoid_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -120425,10 +124589,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120448,17 +124609,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vrnd_riscv64") {
+-    source_set("f32-vsigmoid_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc2w-gemm_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "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") {
 +    cflags = [
 +  
 +    ]
@@ -120468,52 +124634,53 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
--        "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
--        "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
--        "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c",
--      ]
--
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-vrnd_riscv64_standalone") {
+-    source_set("f32-vsigmoid_riscv64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qd8-f32-qc2w-gemm_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
--        "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
--        "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
--        "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120533,14 +124700,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vrsqrt_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-vsin_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -120548,7 +124716,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120562,29 +124730,21 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-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"
++    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) {
--    source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") {
+-    source_set("f32-vsin_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -120592,7 +124752,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120612,24 +124772,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vrsqrt_riscv64") {
+-    source_set("f32-vsin_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c",
+-      ]
++if (build_with_chromium) {
++  source_set("qd8-f32-qc4w-gemm_ppc64") {
 +    cflags = [
 +  
 +    ]
@@ -120640,26 +124798,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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",
@@ -120667,36 +124813,39 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
 -  # 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 = []
-+if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qd8-f32-qc4w-gemm_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-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/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",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120724,55 +124873,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vsigmoid_riscv64") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_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"
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -120780,15 +124902,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vsigmoid_riscv64_standalone") {
--      cflags = []
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    public_configs = [ ":xnnpack_public_config" ]
  
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d_standalone") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120815,24 +124944,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vsin_riscv64") {
+-    source_set("f32-vsqrt_riscv64") {
 -      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",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_ppc64") {
++  source_set("qd8-f32-qc8w-gemm_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/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" ]
@@ -120865,25 +124994,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-vsin_riscv64_standalone") {
+-    source_set("f32-vsqrt_riscv64_standalone") {
 -      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("qd8-f32-qc8w-gemm_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/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/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" ]
@@ -120911,7 +125040,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d") {
+-    source_set("f32-vtanh_arch=rv64gcv-abi=lp64d") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -120919,7 +125048,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c",
+-        "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120947,7 +125076,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # 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-vtanh_arch=rv64gcv-abi=lp64d_standalone") {
 -      cflags = [
 -        "-mabi=lp64d",
 -        "-march=rv64gcv",
@@ -120955,7 +125084,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c",
+-        "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120982,51 +125111,41 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-vsqrt_riscv64") {
+-    source_set("f32-vtanh_riscv64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_ppc64") {
++  source_set("qd8-f32-qc8w-igemm_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/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vsqrt_riscv64_standalone") {
--      cflags = []
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -121034,91 +125153,30 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 -    }
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("f32-vtanh_riscv64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vtanh_riscv64_standalone") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_ppc64_standalone") {
++  source_set("qd8-f32-qc8w-igemm_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"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vtanh_riscv64_standalone") {
--      cflags = []
--
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c",
@@ -121143,16 +125201,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("f32-vunary_arch=rv64gcv-abi=lp64d") {
@@ -121179,21 +125231,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vunary_arch=rv64gcv-abi=lp64d_standalone") {
@@ -121226,8 +125275,9 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
+     }
    }
 +}
  
@@ -121241,49 +125291,66 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "src/src/f32-vunary/gen/f32-vneg-scalar.c",
 -        "src/src/f32-vunary/gen/f32-vsqr-scalar.c",
 -      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_ppc64_standalone") {
++if (build_with_chromium) {
++  source_set("qs8-dwconv_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.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" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_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-vunary_riscv64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-dwconv_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"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -121309,16 +125376,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("operators_riscv64") {
 -      cflags = []
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/operators/argmax-pooling-nhwc.c",
@@ -121357,37 +125431,28 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qs8-packw_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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("operators_riscv64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  source_set("qs8-f32-vcvt_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -121435,6 +125500,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
@@ -121444,17 +125521,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_ppc64_standalone") {
++  source_set("qs8-f32-vcvt_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-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -121497,17 +125571,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc2w-gemm_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_ppc64") {
++  source_set("qs8-packw_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-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 = [
@@ -121611,17 +125685,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  }
 +# 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-packw_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-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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -121727,15 +125801,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_ppc64") {
++  source_set("qs8-qc2w-gemm_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-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -121794,15 +125870,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-qc2w-gemm_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-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 = [
@@ -121846,19 +125924,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qb4w-gemm_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_ppc64") {
++  source_set("qs8-qc4w-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-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 = [
@@ -121915,19 +125989,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_ppc64_standalone") {
++  source_set("qs8-qc4w-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-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 = [
@@ -122010,15 +126080,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_ppc64") {
++  source_set("qs8-qc8w-dwconv_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-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -122077,15 +126151,19 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_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-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 = [
@@ -122155,15 +126233,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_ppc64") {
++  source_set("qs8-qc8w-gemm_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-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -122246,15 +126324,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-gemm_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-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 = [
@@ -122326,14 +126404,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_ppc64") {
++  source_set("qs8-qc8w-igemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -122416,14 +126495,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qc8w-igemm_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-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 = [
@@ -122495,14 +126575,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_ppc64") {
++  source_set("qs8-qu8-packw_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -122585,14 +126665,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-qu8-packw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -      sources = [
@@ -122690,14 +126770,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_ppc64") {
++  source_set("qs8-rdsum_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -122755,14 +126835,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rdsum_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      sources = [
@@ -122830,15 +126910,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_ppc64") {
++  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -122887,15 +126966,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_ppc64_standalone") {
++  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -122973,15 +127051,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-qc2w-gemm_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_ppc64") {
++  source_set("qs8-vadd_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-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -123041,15 +127119,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_ppc64_standalone") {
++  source_set("qs8-vadd_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-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -123134,14 +127212,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_ppc64") {
++  source_set("qs8-vaddc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -123201,14 +127280,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -123311,14 +127391,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_ppc64") {
++  source_set("qs8-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -123377,14 +127457,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -123454,14 +127534,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_ppc64") {
++  source_set("qs8-vlrelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -123544,14 +127624,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_ppc64_standalone") {
++  source_set("qs8-vlrelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
@@ -123595,14 +127675,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-igemm_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_ppc64") {
++  source_set("qs8-vmul_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -123659,14 +127739,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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_ppc64_standalone") {
++  source_set("qs8-vmul_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -123748,14 +127828,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_ppc64") {
++  source_set("qs8-vmulc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -123813,14 +127893,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vmulc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -123888,14 +127968,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_ppc64") {
++  source_set("qs8-vprelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -123976,14 +128056,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vprelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -124051,14 +128131,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_ppc64") {
++  source_set("qs8-vpreluc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -124139,14 +128219,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vpreluc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -124216,17 +128296,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_ppc64") {
++  source_set("qs8-vrpreluc_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/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -124307,17 +128384,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qs8-vrpreluc_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/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -124387,14 +128461,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_ppc64") {
++  source_set("qu8-dwconv_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -124475,14 +128552,17 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-dwconv_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -124550,15 +128630,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_ppc64") {
++  source_set("qu8-f32-vcvt_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-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -124639,15 +128718,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-f32-vcvt_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-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -124715,15 +128793,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_ppc64") {
++  source_set("qu8-gemm_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-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) {
@@ -124804,15 +128882,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-gemm_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-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -124880,14 +128958,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_ppc64") {
++  source_set("qu8-igemm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.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) {
@@ -124968,14 +129047,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_ppc64_standalone") {
++  source_set("qu8-igemm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.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 = [
@@ -125018,14 +129098,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qs8-vmulc_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_ppc64") {
++  source_set("qu8-rdsum_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -      sources = [
@@ -125081,14 +129161,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_ppc64_standalone") {
++  source_set("qu8-rdsum_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -      deps = [
@@ -125167,15 +129247,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_ppc64") {
++  source_set("qu8-rsum_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-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -125229,15 +129308,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-rsum_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-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -125305,15 +129383,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_ppc64") {
++  source_set("qu8-vadd_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-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -125396,15 +129474,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vadd_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-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -125502,14 +129580,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_ppc64") {
++  source_set("qu8-vaddc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -125567,14 +129646,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vaddc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -125642,14 +129722,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_ppc64") {
++  source_set("qu8-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -125732,14 +129812,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -125809,14 +129889,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_ppc64") {
++  source_set("qu8-vlrelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -125899,14 +129979,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vlrelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
@@ -125976,14 +130056,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_ppc64") {
++  source_set("qu8-vmul_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -126064,14 +130144,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vmul_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -126139,14 +130219,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_ppc64") {
++  source_set("qu8-vmulc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -126227,14 +130307,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vmulc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -126302,14 +130382,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_ppc64") {
++  source_set("qu8-vprelu_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -126390,14 +130470,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-vprelu_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -126467,14 +130547,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_ppc64") {
++  source_set("qu8-vpreluc_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -126555,14 +130635,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vpreluc_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -126632,16 +130712,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("reference_ppc64") {
++  source_set("qu8-vrpreluc_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/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -126722,16 +130800,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("qu8-vrpreluc_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/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -126799,14 +130875,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_ppc64") {
++  source_set("reference_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
  
 -  if (build_with_chromium) {
@@ -126887,14 +130965,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("reference_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
  
 -      sources = [
@@ -126962,14 +131042,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_ppc64") {
++  source_set("s8-ibilinear_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -127050,14 +131130,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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-ibilinear_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -127125,15 +131205,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_ppc64") {
++  source_set("s8-maxpool_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-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -127214,15 +131293,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_ppc64_standalone") {
++  source_set("s8-maxpool_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-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -127265,16 +131343,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qu8-vmulc_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_ppc64") {
++  source_set("s8-rdminmax_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-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -127330,16 +131407,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_ppc64_standalone") {
++  source_set("s8-rdminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      deps = [
@@ -127418,14 +131494,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_ppc64") {
++  source_set("s8-rminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -127479,14 +131557,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_ppc64_standalone") {
++  source_set("s8-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -127529,42 +131609,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -    source_set("qu8-vrpreluc_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("subgraph_ppc64") {
++  source_set("s8-vclamp_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/rope.c",
-+    "src/src/subgraph/softmax.c",
-+    "src/src/subgraph/space-to-depth-2d.c",
-+    "src/src/subgraph/static-constant-pad.c",
-+    "src/src/subgraph/static-reduce.c",
-+    "src/src/subgraph/static-resize-bilinear-2d.c",
-+    "src/src/subgraph/static-slice.c",
-+    "src/src/subgraph/static-transpose.c",
-+    "src/src/subgraph/subgraph-utils.c",
-+    "src/src/subgraph/unary.c",
-+    "src/src/subgraph/unpooling-2d.c",
-+    "src/src/subgraph/validation.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -127622,42 +131674,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("subgraph_ppc64_standalone") {
++  source_set("s8-vclamp_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/rope.c",
-+    "src/src/subgraph/softmax.c",
-+    "src/src/subgraph/space-to-depth-2d.c",
-+    "src/src/subgraph/static-constant-pad.c",
-+    "src/src/subgraph/static-reduce.c",
-+    "src/src/subgraph/static-resize-bilinear-2d.c",
-+    "src/src/subgraph/static-slice.c",
-+    "src/src/subgraph/static-transpose.c",
-+    "src/src/subgraph/subgraph-utils.c",
-+    "src/src/subgraph/unary.c",
-+    "src/src/subgraph/unpooling-2d.c",
-+    "src/src/subgraph/validation.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -127725,38 +131749,141 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "src/include/xnnpack.h",
 -        "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c",
 -      ]
--
++if (build_with_chromium) {
++  source_set("subgraph_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"
++    ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("tables_ppc64") {
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("s8-ibilinear_riscv64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("subgraph_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/tables/exp2-k-over-2048.c",
-+    "src/src/tables/exp2-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-16.c",
-+    "src/src/tables/exp2minus-k-over-2048.c",
-+    "src/src/tables/exp2minus-k-over-32.c",
-+    "src/src/tables/exp2minus-k-over-4.c",
-+    "src/src/tables/exp2minus-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-8.c",
-+    "src/src/tables/vlog.c"
++      "src/src/subgraph/argmax-pooling-2d.c",
++    "src/src/subgraph/average-pooling-2d.c",
++    "src/src/subgraph/batch-matrix-multiply.c",
++    "src/src/subgraph/binary.c",
++    "src/src/subgraph/concatenate.c",
++    "src/src/subgraph/convolution-2d.c",
++    "src/src/subgraph/copy.c",
++    "src/src/subgraph/deconvolution-2d.c",
++    "src/src/subgraph/deprecated.c",
++    "src/src/subgraph/depth-to-space-2d.c",
++    "src/src/subgraph/depthwise-convolution-2d.c",
++    "src/src/subgraph/even-split.c",
++    "src/src/subgraph/fully-connected-sparse.c",
++    "src/src/subgraph/fully-connected.c",
++    "src/src/subgraph/max-pooling-2d.c",
++    "src/src/subgraph/pack-lh.c",
++    "src/src/subgraph/reshape-helpers.c",
++    "src/src/subgraph/rewrites/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 = [
+-        "src/include/xnnpack.h",
+-        "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/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" ]
@@ -127764,20 +131891,52 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-ibilinear_riscv64_standalone") {
--      cflags = []
+-  if (build_with_chromium) {
+-    source_set("s8-maxpool_arch=rv64gcv-abi=lp64d") {
+-      cflags = [
+-        "-mabi=lp64d",
+-        "-march=rv64gcv",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      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",
++      "//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("s8-maxpool_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-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -127797,17 +131956,22 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-maxpool_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("tables_ppc64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c",
+-      ]
++if (build_with_chromium) {
++  source_set("tables_ppc64") {
 +    cflags = [
 +  
 +    ]
@@ -127825,25 +131989,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    "src/src/tables/vlog.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -127851,12 +132004,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
@@ -127864,7 +132021,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("s8-maxpool_riscv64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("tables_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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c",
@@ -127889,16 +132065,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("u8-ibilinear_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d") {
@@ -127924,21 +132094,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
@@ -127970,17 +132137,23 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rdminmax_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_ppc64_standalone") {
+-
+-      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",
+-      ]
++if (build_with_chromium) {
++  source_set("u8-ibilinear_ppc64") {
 +    cflags = [
 +  
 +    ]
@@ -127990,26 +132163,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
--      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",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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",
@@ -128017,12 +132178,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
@@ -128030,7 +132195,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("s8-rdminmax_riscv64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("u8-ibilinear_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
@@ -128056,16 +132232,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("u8-lut32norm_ppc64") {
-+    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" ]
  
 -  if (build_with_chromium) {
 -    source_set("s8-rminmax_arch=rv64gcv-abi=lp64d") {
@@ -128092,21 +132262,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
@@ -128139,17 +132306,24 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-rminmax_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("u8-lut32norm_ppc64_standalone") {
+-
+-      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",
+-      ]
++if (build_with_chromium) {
++  source_set("u8-lut32norm_ppc64") {
 +    cflags = [
 +  
 +    ]
@@ -128159,27 +132333,14 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
--      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",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/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",
@@ -128187,12 +132348,16 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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" ]
    }
 +}
  
@@ -128200,7 +132365,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("s8-rminmax_riscv64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("u8-lut32norm_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
@@ -128227,16 +132403,10 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("u8-maxpool_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
-+    ]
++    configs -= [ "//build/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("s8-vclamp_arch=rv64gcv-abi=lp64d") {
@@ -128261,21 +132431,18 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
@@ -128306,66 +132473,62 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("s8-vclamp_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/s8-vclamp/s8-vclamp-scalar-u4.c",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("u8-maxpool_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++    ]
  
 -      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("s8-vclamp_riscv64_standalone") {
 -      cflags = []
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/s8-vclamp/s8-vclamp-scalar-u4.c",
@@ -128389,27 +132552,25 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+if (build_with_chromium) {
-+  source_set("u8-rdminmax_ppc64") {
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("subgraph_riscv64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("u8-maxpool_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("subgraph_riscv64") {
--      cflags = []
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/subgraph/argmax-pooling-2d.c",
@@ -128429,6 +132590,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "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",
@@ -128454,35 +132616,26 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("subgraph_riscv64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -128503,6 +132656,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        "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",
@@ -128534,6 +132688,53 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("tables_riscv64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/tables/exp2-k-over-2048.c",
+-        "src/src/tables/exp2-k-over-64.c",
+-        "src/src/tables/exp2minus-k-over-16.c",
+-        "src/src/tables/exp2minus-k-over-2048.c",
+-        "src/src/tables/exp2minus-k-over-32.c",
+-        "src/src/tables/exp2minus-k-over-4.c",
+-        "src/src/tables/exp2minus-k-over-64.c",
+-        "src/src/tables/exp2minus-k-over-8.c",
+-        "src/src/tables/vlog.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++if (build_with_chromium) {
++  source_set("u8-rdminmax_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 -    }
 -  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -128541,14 +132742,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  if (build_with_chromium) {
--    source_set("tables_riscv64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("tables_riscv64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -128573,6 +132775,59 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/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("u8-ibilinear_riscv64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("u8-rdminmax_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
@@ -128586,7 +132841,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("tables_riscv64_standalone") {
+-    source_set("u8-ibilinear_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
 +  source_set("u8-rminmax_ppc64") {
@@ -128603,15 +132858,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      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" ]
@@ -128639,7 +132886,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("u8-ibilinear_riscv64") {
+-    source_set("u8-lut32norm_riscv64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -128650,7 +132897,7 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c",
+-        "src/src/u8-lut32norm/u8-lut32norm-scalar.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -128697,13 +132944,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("u8-ibilinear_riscv64_standalone") {
+-    source_set("u8-lut32norm_riscv64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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" ]
@@ -128730,12 +132977,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("u8-lut32norm_riscv64") {
--      cflags = []
+-    source_set("u8-maxpool_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-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -128770,18 +133020,15 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("u8-lut32norm_riscv64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-    source_set("u8-maxpool_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-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -128802,6 +133049,13 @@ diff -ur third_party/xnnpack/BUILD.gn /home/nonroot/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}

diff --git a/chromium-148-Add-AutoDarkModeSkipImages-flag-to-bypass-image-dark-mode.patch b/chromium-148-Add-AutoDarkModeSkipImages-flag-to-bypass-image-dark-mode.patch
deleted file mode 100644
index 65f2cd3..0000000
--- a/chromium-148-Add-AutoDarkModeSkipImages-flag-to-bypass-image-dark-mode.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit 59996c3a87e7a332247f053a34125ea8eb7e351a
-Author: Prashant Nevase <pnevase@microsoft.com>
-Date:   Fri May 15 08:01:49 2026 -0700
-
-    Add AutoDarkModeSkipImages flag to bypass image dark mode
-    
-    When the AutoDarkModeSkipImages flag is enabled, the dark mode filter
-    (Auto Dark / force-dark) skips applying dark mode to images entirely;
-    all images are kept untouched as if they are in light mode.
-    
-    This is a stop gap solution till default dark mode works as expected.
-    Users will have to use following command for using it.
-    chrome.exe --enable-blink-features="AutoDarkModeSkipImages"
-    
-    Bug: 449909524
-    Change-Id: Ib4af9253d9e65f8e517994be661a15d3fb4f9083
-    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7849600
-    Reviewed-by: Stephen Chenney <schenney@chromium.org>
-    Commit-Queue: Prashant Nevase <pnevase@microsoft.com>
-    Cr-Commit-Position: refs/heads/main@{#1631280}
-
-diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc b/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc
-index 6bc23ce40786..414fb95a44db 100644
---- a/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc
-+++ b/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc
-@@ -19,6 +19,7 @@
- #include "third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h"
- #include "third_party/blink/renderer/platform/graphics/dark_mode_settings.h"
- #include "third_party/blink/renderer/platform/graphics/image.h"
-+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
- #include "third_party/blink/renderer/platform/wtf/hash_functions.h"
- #include "third_party/skia/include/core/SkBitmap.h"
- #include "third_party/skia/include/core/SkColor.h"
-@@ -201,6 +202,12 @@ void DarkModeFilter::ApplyFilterToImage(Image* image,
-   DCHECK(image);
-   DCHECK(flags);
- 
-+  // When the `AutoDarkModeSkipImages` feature is enabled, never apply dark mode
-+  // to images bypassing classification entirely.
-+  if (RuntimeEnabledFeatures::AutoDarkModeSkipImagesEnabled()) {
-+    return;
-+  }
-+
-   // Raster-side dark mode path - Just set the dark mode on flags and dark
-   // mode will be applied at compositor side during rasterization.
-   if (ShouldUseRasterSidePath(image)) {
-diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-index 16316a0e0ce9..ad7b29a2a47d 100644
---- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
-+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -749,6 +749,14 @@
-       base_feature: "none",
-       origin_trial_feature_name: "AutoDarkMode",
-     },
-+    {
-+      // When enabled, the dark mode filter (Auto Dark / force-dark) skips
-+      // applying dark mode to images entirely; all images are kept untouched
-+      // as if they are in light mode.
-+      // P.N. `AutoDarkMode` needs to be applied separately.
-+      name: "AutoDarkModeSkipImages",
-+      base_feature: "AutoDarkModeSkipImages",
-+    },
-     {
-       name: "Autofill",
-       public: true,

diff --git a/chromium-148-Add-chromatic-pixels-feature-based-on-muted-hue-colors-for-dark-mode.patch b/chromium-148-Add-chromatic-pixels-feature-based-on-muted-hue-colors-for-dark-mode.patch
deleted file mode 100644
index ba9ac9c..0000000
--- a/chromium-148-Add-chromatic-pixels-feature-based-on-muted-hue-colors-for-dark-mode.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-commit 210a781e7b791586bbb898f9a8c9d025bf30593a
-Author: Prashant Nevase <pnevase@microsoft.com>
-Date:   Sun May 24 13:56:54 2026 -0700
-
-    Add chromatic pixels feature based on muted-hue colors for dark mode.
-    
-    This cl adds new feature based on muted-hue or limited color palette.
-    This new feature uses a low chroma threshold so it counts both vivid
-    colors and muted/mid-tone colors that still carry hue information,
-    distinct from `saturated_pixel_ratio`, which counts only highly
-    saturated pixels.
-    
-    This helps skipping images whose pixels are mostly chromatic (muted/
-    mid-tone hues), e.g. emotes, stickers, or character art. Their semantic
-    hue must be preserved. Grayscale text and JPEG chroma noise stay below
-    `kFeatureChromaticPixelRatioThreshold` and are still inverted.
-    
-    Bug: 449909524
-    Change-Id: I0a22736f3403b5e33e1ab395909b5de159eab366
-    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7866369
-    Commit-Queue: Stephen Chenney <schenney@chromium.org>
-    Auto-Submit: Prashant Nevase <pnevase@microsoft.com>
-    Reviewed-by: Stephen Chenney <schenney@chromium.org>
-    Cr-Commit-Position: refs/heads/main@{#1635553}
-
-diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-index 0111db051cca..ff66f21e8c7b 100644
---- a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-+++ b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-@@ -29,6 +29,14 @@ constexpr int kHighLightnessThreshold = 96;
- // typical photographic colors which usually have chroma below 60.
- constexpr int kHighSaturationThreshold = 80;
- 
-+// Per-pixel chroma at or above which the pixel is considered chromatic
-+// (i.e. not effectively gray). Set well below kHighSaturationThreshold so
-+// that muted / mid-tone colors found in illustrated assets (olive, teal,
-+// maroon, pastels) are still counted as chromatic. Anti-aliased fringes
-+// around grayscale text and minor JPEG chroma noise typically stay below
-+// chroma ~15, so this floor still excludes them.
-+constexpr int kChromaticThreshold = 20;
-+
- // Decision tree thresholds for classifying images
- 
- // Lower and upper color thresholds for grayscale and color images.
-@@ -53,6 +61,13 @@ constexpr float kFeatureHighSaturationRatioThreshold = 0.3f;
- // below kFeatureHighSaturationRatioThreshold.
- constexpr float kFeatureLowSaturationRatioThreshold = 0.1f;
- 
-+// Chromatic pixel ratio threshold above which a limited-palette colorful
-+// image is considered to carry semantic color information end-to-end
-+// (rather than being a near-grayscale icon with a tiny color accent) and
-+// is skipped from inversion. Tuned so dark / grayscale text with
-+// anti-aliased fringes or minor chroma noise stays below this floor.
-+constexpr float kFeatureChromaticPixelRatioThreshold = 0.5f;
-+
- bool IsColorGray(const SkColor& color) {
-   return abs(static_cast<int>(SkColorGetR(color)) -
-              static_cast<int>(SkColorGetG(color))) +
-@@ -84,6 +99,17 @@ bool IsColorSaturated(const SkColor& color) {
-   return chroma >= kHighSaturationThreshold;
- }
- 
-+bool IsColorChromatic(const SkColor& color) {
-+  // Same chroma metric as IsColorSaturated() but with a much lower
-+  // threshold, so muted / mid-tone colors are still counted as carrying
-+  // hue information.
-+  int r = SkColorGetR(color);
-+  int g = SkColorGetG(color);
-+  int b = SkColorGetB(color);
-+  int chroma = std::max({r, g, b}) - std::min({r, g, b});
-+  return chroma >= kChromaticThreshold;
-+}
-+
- }  // namespace
- 
- DarkModeImageClassifier::DarkModeImageClassifier() = default;
-@@ -229,6 +255,7 @@ DarkModeImageClassifier::Features DarkModeImageClassifier::ComputeFeatures(
-   int color_pixels = 0;
-   int high_luma_pixels = 0;
-   int saturated_pixels = 0;
-+  int chromatic_pixels = 0;
-   for (const SkColor& sample : sampled_pixels) {
-     if (!IsColorGray(sample)) {
-       color_pixels++;
-@@ -241,6 +268,10 @@ DarkModeImageClassifier::Features DarkModeImageClassifier::ComputeFeatures(
-     if (IsColorSaturated(sample)) {
-       saturated_pixels++;
-     }
-+
-+    if (IsColorChromatic(sample)) {
-+      chromatic_pixels++;
-+    }
-   }
- 
-   ColorMode color_mode = (color_pixels > samples_count / 100)
-@@ -257,6 +288,8 @@ DarkModeImageClassifier::Features DarkModeImageClassifier::ComputeFeatures(
-       static_cast<float>(high_luma_pixels) / samples_count;
-   features.saturated_pixel_ratio =
-       static_cast<float>(saturated_pixels) / samples_count;
-+  features.chromatic_pixel_ratio =
-+      static_cast<float>(chromatic_pixels) / samples_count;
- 
-   return features;
- }
-@@ -354,6 +387,17 @@ DarkModeResult DarkModeImageClassifier::ClassifyUsingDecisionTree(
-     return DarkModeResult::kDoNotApplyFilter;
-   }
- 
-+  // Skip limited-palette colorful images whose pixels are mostly chromatic
-+  // (muted / mid-tone hues), e.g. emotes, stickers, or character art. Their
-+  // semantic hue must be preserved. Grayscale text and JPEG chroma noise
-+  // stay below |kFeatureChromaticPixelRatioThreshold| and are still inverted.
-+  if (features.is_colorful &&
-+      features.color_buckets_ratio <
-+          kFeatureHighColorCountThreshold[features.is_colorful] &&
-+      features.chromatic_pixel_ratio > kFeatureChromaticPixelRatioThreshold) {
-+    return DarkModeResult::kDoNotApplyFilter;
-+  }
-+
-   // Very few colors means it's not a photo, apply the filter.
-   if (features.color_buckets_ratio <
-       kFeatureLowColorCountThreshold[features.is_colorful]) {
-diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h
-index e04a437d223a..686f0ddcb11c 100644
---- a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h
-+++ b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h
-@@ -47,6 +47,13 @@ class PLATFORM_EXPORT DarkModeImageClassifier {
-     // image. Used to detect images dominated by vivid flat colors whose
-     // colors carry meaning and should be preserved rather than inverted.
-     float saturated_pixel_ratio;
-+
-+    // Ratio of chromatic (non-near-gray) pixels to all sampled pixels in the
-+    // image. Uses a low chroma threshold so it counts both vivid colors and
-+    // muted / mid-tone colors that still carry hue information. Distinct
-+    // from |saturated_pixel_ratio|, which counts only highly saturated
-+    // pixels.
-+    float chromatic_pixel_ratio;
-   };
- 
-   DarkModeResult Classify(const SkPixmap& pixmap, const SkIRect& src) const;
-diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier_test.cc b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier_test.cc
-index 6ec427db1d72..477b0a8e3344 100644
---- a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier_test.cc
-+++ b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier_test.cc
-@@ -492,4 +492,15 @@ TEST_F(DarkModeImageClassifierTest,
-             DarkModeResult::kDoNotApplyFilter);
- }
- 
-+TEST_F(DarkModeImageClassifierTest, SyntheticImageWithMutedChromaticColors) {
-+  // Colorful, limited-palette image with muted mid-tone colors (chroma in
-+  // [20, 80), luma < 96).
-+  constexpr SkColor kMutedTeal = SkColorSetRGB(60, 100, 80);
-+  SkBitmap bitmap = MakeStripedBitmap(kMutedTeal, kMutedTeal, 0, 0);
-+  SkPixmap pixmap;
-+  ASSERT_TRUE(bitmap.peekPixels(&pixmap));
-+  EXPECT_EQ(image_classifier()->Classify(pixmap, bitmap.bounds()),
-+            DarkModeResult::kDoNotApplyFilter);
-+}
-+
- }  // namespace blink

diff --git a/chromium-148-Add-luminance-ratio-feature-for-dark-mode-image-classification.patch b/chromium-148-Add-luminance-ratio-feature-for-dark-mode-image-classification.patch
deleted file mode 100644
index bf9b9f8..0000000
--- a/chromium-148-Add-luminance-ratio-feature-for-dark-mode-image-classification.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-commit a207a12457397aebd0ef0898b645c62345c160ce
-Author: Prashant Nevase <pnevase@microsoft.com>
-Date:   Thu May 7 00:03:47 2026 -0700
-
-    Add luminance ratio feature for dark mode image classification.
-    
-    Image with a transparent background and light foreground (e.g.
-    a logo with light color lettering on transparent PNG) was getting
-    inverted by the dark mode filter, turning the foreground dark and
-    making it merge with dark background.
-    
-    This cl adds a luminance ratio feature to skip filtering when both
-    transparency ratio and luminance ratio exceed their thresholds. Here
-    only high luminance ratio is considered.
-    
-    This new feature corrects existing tests having images with transparent
-    background and light foreground.
-    
-    Bug: 449909524
-    Change-Id: Ia84137ad9af2c9d253a3ba46b255147e356b542f
-    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7806455
-    Commit-Queue: Prashant Nevase <pnevase@microsoft.com>
-    Reviewed-by: Stephen Chenney <schenney@chromium.org>
-    Cr-Commit-Position: refs/heads/main@{#1626754}
-
-diff --git a/third_party/blink/renderer/platform/blink_platform_unittests_bundle_data.filelist b/third_party/blink/renderer/platform/blink_platform_unittests_bundle_data.filelist
-index 6c6bf1fbda07..acb3f240d841 100644
---- a/third_party/blink/renderer/platform/blink_platform_unittests_bundle_data.filelist
-+++ b/third_party/blink/renderer/platform/blink_platform_unittests_bundle_data.filelist
-@@ -693,6 +693,9 @@
- ../../web_tests/images/resources/small-square-with-colorspin-profile.jpg
- ../../web_tests/images/resources/sprite_all_fragments_same.png
- ../../web_tests/images/resources/sprite_alternate_fragments_same.png
-+../../web_tests/images/resources/sprite_dark_background.png
-+../../web_tests/images/resources/sprite_light_background.png
-+../../web_tests/images/resources/sprite_transparent_background.png
- ../../web_tests/images/resources/stripes-large.png
- ../../web_tests/images/resources/stripes-small.png
- ../../web_tests/images/resources/test-load.jpg
-diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-index cf923b9493fd..8151543ee33f 100644
---- a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-+++ b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-@@ -21,6 +21,20 @@ namespace {
- constexpr std::array<float, 2> kLowColorCountThreshold = {0.8125, 0.015137};
- constexpr std::array<float, 2> kHighColorCountThreshold = {1, 0.025635};
- 
-+// Color is considered light if its luma is above this threshold.
-+constexpr int kHighLightnessThreshold = 96;
-+
-+// Luminance ratio threshold above which the image is classified as light.
-+constexpr float kHighLuminanceThreshold = 0.5f;
-+
-+// Transparency ratio threshold above which the image is classified as
-+// transparent, meaning most of the background pixels are transparent.
-+constexpr float kTransparencyRatioThreshold = 0.4f;
-+
-+const int kMaxSampledPixels = 1000;
-+const int kMaxBlocks = 10;
-+const float kMinOpaquePixelPercentageForForeground = 0.2;
-+
- bool IsColorGray(const SkColor& color) {
-   return abs(static_cast<int>(SkColorGetR(color)) -
-              static_cast<int>(SkColorGetG(color))) +
-@@ -33,9 +47,13 @@ bool IsColorTransparent(const SkColor& color) {
-   return (SkColorGetA(color) < 128);
- }
- 
--const int kMaxSampledPixels = 1000;
--const int kMaxBlocks = 10;
--const float kMinOpaquePixelPercentageForForeground = 0.2;
-+bool IsColorLight(const SkColor& color) {
-+  // ITU-R BT.601 Y'CbCr based luma calculation.
-+  int luma = (SkColorGetR(color) * 299 + SkColorGetG(color) * 587 +
-+              SkColorGetB(color) * 114) /
-+             1000;
-+  return luma >= kHighLightnessThreshold;
-+}
- 
- }  // namespace
- 
-@@ -179,12 +197,18 @@ DarkModeImageClassifier::Features DarkModeImageClassifier::ComputeFeatures(
-     const float background_ratio) const {
-   int samples_count = static_cast<int>(sampled_pixels.size());
- 
--  // Is image grayscale.
-   int color_pixels = 0;
-+  int high_luma_pixels = 0;
-   for (const SkColor& sample : sampled_pixels) {
--    if (!IsColorGray(sample))
-+    if (!IsColorGray(sample)) {
-       color_pixels++;
-+    }
-+
-+    if (IsColorLight(sample)) {
-+      high_luma_pixels++;
-+    }
-   }
-+
-   ColorMode color_mode = (color_pixels > samples_count / 100)
-                              ? ColorMode::kColor
-                              : ColorMode::kGrayscale;
-@@ -195,6 +219,8 @@ DarkModeImageClassifier::Features DarkModeImageClassifier::ComputeFeatures(
-       ComputeColorBucketsRatio(sampled_pixels, color_mode);
-   features.transparency_ratio = transparency_ratio;
-   features.background_ratio = background_ratio;
-+  features.high_luminance_ratio =
-+      static_cast<float>(high_luma_pixels) / samples_count;
- 
-   return features;
- }
-@@ -258,18 +284,26 @@ DarkModeResult DarkModeImageClassifier::ClassifyWithFeatures(
- 
- DarkModeResult DarkModeImageClassifier::ClassifyUsingDecisionTree(
-     const DarkModeImageClassifier::Features& features) const {
--  float low_color_count_threshold =
--      kLowColorCountThreshold[features.is_colorful];
--  float high_color_count_threshold =
--      kHighColorCountThreshold[features.is_colorful];
-+  // Skip filtering for images that have transparent background and whose
-+  // foreground is predominantly light. Inverting such images would make
-+  // visible pixels darker, causing them to merge with dark background, so do
-+  // not apply filter.
-+  if (features.transparency_ratio > kTransparencyRatioThreshold &&
-+      features.high_luminance_ratio > kHighLuminanceThreshold) {
-+    return DarkModeResult::kDoNotApplyFilter;
-+  }
- 
-   // Very few colors means it's not a photo, apply the filter.
--  if (features.color_buckets_ratio < low_color_count_threshold)
-+  if (features.color_buckets_ratio <
-+      kLowColorCountThreshold[features.is_colorful]) {
-     return DarkModeResult::kApplyFilter;
-+  }
- 
-   // Too many colors means it's probably photorealistic, do not apply it.
--  if (features.color_buckets_ratio > high_color_count_threshold)
-+  if (features.color_buckets_ratio >
-+      kHighColorCountThreshold[features.is_colorful]) {
-     return DarkModeResult::kDoNotApplyFilter;
-+  }
- 
-   // In-between, decision tree cannot give a precise result.
-   return DarkModeResult::kNotClassified;
-diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h
-index a660e9c999c7..9bc536750e76 100644
---- a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h
-+++ b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h
-@@ -40,6 +40,9 @@ class PLATFORM_EXPORT DarkModeImageClassifier {
-     // background.
-     float transparency_ratio;
-     float background_ratio;
-+
-+    // Ratio of high luminance pixels to all sampled pixels in the image.
-+    float high_luminance_ratio;
-   };
- 
-   DarkModeResult Classify(const SkPixmap& pixmap, const SkIRect& src) const;
-diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier_test.cc b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier_test.cc
-index fa54e4e8fddc..e634550498a7 100644
---- a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier_test.cc
-+++ b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier_test.cc
-@@ -63,7 +63,7 @@ TEST_F(DarkModeImageClassifierTest, ValidImage) {
-   bitmap.peekPixels(&pixmap);
-   EXPECT_EQ(image_classifier()->Classify(
-                 pixmap, SkIRect::MakeWH(image->width(), image->height())),
--            DarkModeResult::kApplyFilter);
-+            DarkModeResult::kDoNotApplyFilter);
- }
- 
- TEST_F(DarkModeImageClassifierTest, InvalidImage) {
-@@ -156,6 +156,58 @@ TEST_F(DarkModeImageClassifierTest, ImageSpriteAlternateFragmentsSame) {
-       DarkModeResult::kDoNotApplyFilter);
- }
- 
-+TEST_F(DarkModeImageClassifierTest, ImageWithTransparentBackground) {
-+  scoped_refptr<BitmapImage> image;
-+  SkBitmap bitmap;
-+  SkPixmap pixmap;
-+  image = GetImage("/images/resources/sprite_transparent_background.png");
-+  bitmap = image->AsSkBitmapForCurrentFrame(kDoNotRespectImageOrientation);
-+  bitmap.peekPixels(&pixmap);
-+
-+  EXPECT_EQ(
-+      image_classifier()->Classify(pixmap, SkIRect::MakeXYWH(0, 0, 128, 24)),
-+      DarkModeResult::kApplyFilter);
-+
-+  EXPECT_EQ(
-+      image_classifier()->Classify(pixmap, SkIRect::MakeXYWH(0, 24, 128, 24)),
-+      DarkModeResult::kDoNotApplyFilter);
-+}
-+
-+TEST_F(DarkModeImageClassifierTest, ImageWithLightBackground) {
-+  scoped_refptr<BitmapImage> image;
-+  SkBitmap bitmap;
-+  SkPixmap pixmap;
-+  image = GetImage("/images/resources/sprite_light_background.png");
-+  bitmap = image->AsSkBitmapForCurrentFrame(kDoNotRespectImageOrientation);
-+  bitmap.peekPixels(&pixmap);
-+
-+  // TODO(pnevase): Handle this case better.
-+  EXPECT_EQ(
-+      image_classifier()->Classify(pixmap, SkIRect::MakeXYWH(0, 0, 128, 24)),
-+      DarkModeResult::kDoNotApplyFilter);
-+
-+  EXPECT_EQ(
-+      image_classifier()->Classify(pixmap, SkIRect::MakeXYWH(0, 24, 128, 24)),
-+      DarkModeResult::kApplyFilter);
-+}
-+
-+TEST_F(DarkModeImageClassifierTest, ImageWithDarkBackground) {
-+  scoped_refptr<BitmapImage> image;
-+  SkBitmap bitmap;
-+  SkPixmap pixmap;
-+  image = GetImage("/images/resources/sprite_dark_background.png");
-+  bitmap = image->AsSkBitmapForCurrentFrame(kDoNotRespectImageOrientation);
-+  bitmap.peekPixels(&pixmap);
-+
-+  EXPECT_EQ(
-+      image_classifier()->Classify(pixmap, SkIRect::MakeXYWH(0, 0, 128, 24)),
-+      DarkModeResult::kApplyFilter);
-+
-+  EXPECT_EQ(
-+      image_classifier()->Classify(pixmap, SkIRect::MakeXYWH(0, 24, 128, 24)),
-+      DarkModeResult::kDoNotApplyFilter);
-+}
-+
- TEST_F(DarkModeImageClassifierTest, BlockSamples) {
-   SkBitmap bitmap;
-   SkPixmap pixmap;
-@@ -282,12 +334,13 @@ TEST_F(DarkModeImageClassifierTest, FeaturesAndClassification) {
-   EXPECT_NEAR(0.1875f, features.color_buckets_ratio, kEpsilon);
-   EXPECT_NEAR(0.0f, features.transparency_ratio, kEpsilon);
-   EXPECT_NEAR(0.0f, features.background_ratio, kEpsilon);
-+  EXPECT_NEAR(0.3044f, features.high_luminance_ratio, kEpsilon);
- 
-   // Test Case 2:
-   // Grayscale
-   // Color Buckets Ratio: Medium
--  // Decision Tree: Can't Decide
--  // Neural Network: Apply
-+  // Decision Tree: Do Not Apply
-+  // Neural Network: NA
-   image = GetImage("/images/resources/apng08-ref.png");
-   bitmap = image->AsSkBitmapForCurrentFrame(kDoNotRespectImageOrientation);
-   bitmap.peekPixels(&pixmap);
-@@ -298,16 +351,17 @@ TEST_F(DarkModeImageClassifierTest, FeaturesAndClassification) {
-   EXPECT_EQ(image_classifier()->ClassifyWithFeatures(features),
-             DarkModeResult::kDoNotApplyFilter);
-   EXPECT_EQ(image_classifier()->ClassifyUsingDecisionTree(features),
--            DarkModeResult::kNotClassified);
-+            DarkModeResult::kDoNotApplyFilter);
-   EXPECT_FALSE(features.is_colorful);
-   EXPECT_NEAR(0.8125f, features.color_buckets_ratio, kEpsilon);
-   EXPECT_NEAR(0.446667f, features.transparency_ratio, kEpsilon);
-   EXPECT_NEAR(0.03f, features.background_ratio, kEpsilon);
-+  EXPECT_NEAR(0.6144578f, features.high_luminance_ratio, kEpsilon);
- 
-   // Test Case 3:
-   // Color
-   // Color Buckets Ratio: Low
--  // Decision Tree: Apply
-+  // Decision Tree: Do Not Apply
-   // Neural Network: NA.
-   image = GetImage("/images/resources/twitter_favicon.ico");
-   bitmap = image->AsSkBitmapForCurrentFrame(kDoNotRespectImageOrientation);
-@@ -317,13 +371,14 @@ TEST_F(DarkModeImageClassifierTest, FeaturesAndClassification) {
-                                SkIRect::MakeWH(image->width(), image->height()))
-                  .value();
-   EXPECT_EQ(image_classifier()->ClassifyWithFeatures(features),
--            DarkModeResult::kApplyFilter);
-+            DarkModeResult::kDoNotApplyFilter);
-   EXPECT_EQ(image_classifier()->ClassifyUsingDecisionTree(features),
--            DarkModeResult::kApplyFilter);
-+            DarkModeResult::kDoNotApplyFilter);
-   EXPECT_TRUE(features.is_colorful);
-   EXPECT_NEAR(0.0002441f, features.color_buckets_ratio, kEpsilon);
-   EXPECT_NEAR(0.542092f, features.transparency_ratio, kEpsilon);
-   EXPECT_NEAR(0.1500000f, features.background_ratio, kEpsilon);
-+  EXPECT_NEAR(1.0f, features.high_luminance_ratio, kEpsilon);
- 
-   // Test Case 4:
-   // Color
-@@ -345,6 +400,7 @@ TEST_F(DarkModeImageClassifierTest, FeaturesAndClassification) {
-   EXPECT_NEAR(0.032959f, features.color_buckets_ratio, kEpsilon);
-   EXPECT_NEAR(0.0f, features.transparency_ratio, kEpsilon);
-   EXPECT_NEAR(0.0f, features.background_ratio, kEpsilon);
-+  EXPECT_NEAR(0.33f, features.high_luminance_ratio, kEpsilon);
- 
-   // Test Case 5:
-   // Color
-@@ -366,6 +422,7 @@ TEST_F(DarkModeImageClassifierTest, FeaturesAndClassification) {
-   EXPECT_NEAR(0.0151367f, features.color_buckets_ratio, kEpsilon);
-   EXPECT_NEAR(0.0f, features.transparency_ratio, kEpsilon);
-   EXPECT_NEAR(0.0f, features.background_ratio, kEpsilon);
-+  EXPECT_NEAR(0.9255555272102356f, features.high_luminance_ratio, kEpsilon);
- }
- 
- }  // namespace blink
-diff --git a/third_party/blink/web_tests/images/resources/sprite_dark_background.png b/third_party/blink/web_tests/images/resources/sprite_dark_background.png
-new file mode 100644
-index 000000000000..cc67ef3e897d
-Binary files /dev/null and b/third_party/blink/web_tests/images/resources/sprite_dark_background.png differ
-diff --git a/third_party/blink/web_tests/images/resources/sprite_light_background.png b/third_party/blink/web_tests/images/resources/sprite_light_background.png
-new file mode 100644
-index 000000000000..3977af4d55fb
-Binary files /dev/null and b/third_party/blink/web_tests/images/resources/sprite_light_background.png differ
-diff --git a/third_party/blink/web_tests/images/resources/sprite_transparent_background.png b/third_party/blink/web_tests/images/resources/sprite_transparent_background.png
-new file mode 100644
-index 000000000000..df08f2291eb9
-Binary files /dev/null and b/third_party/blink/web_tests/images/resources/sprite_transparent_background.png differ

diff --git a/chromium-148-Add-saturation-feature-for-dark-mode-image-classification.patch b/chromium-148-Add-saturation-feature-for-dark-mode-image-classification.patch
deleted file mode 100644
index f7cc6cf..0000000
--- a/chromium-148-Add-saturation-feature-for-dark-mode-image-classification.patch
+++ /dev/null
@@ -1,853 +0,0 @@
-commit 90fda3febeb4e7391013da953fffe4a5ccbd579c
-Author: Prashant Nevase <pnevase@microsoft.com>
-Date:   Thu May 14 06:54:05 2026 -0700
-
-    Reland "Add saturation feature for dark mode image classification."
-    
-    This is a reland of commit 320dcd441b7661859b2e6ab08382766810ee9e68
-    
-    Original change's description:
-    > Add saturation feature for dark mode image classification.
-    >
-    > Images with vivid/saturated colors (e.g. country flags. logos) were
-    > getting inverted, making them lose the meaning of colors used. This
-    > cl adds saturation ratio feature which helps classify these images
-    > correctly. This uses little stricter ratio (0.3), so comparatively
-    > less images are considered for further classification.
-    >
-    > - Images with a limited palette dominated by highly saturated colors
-    > are skipped.
-    >
-    > - Images with a mostly-light field and a smaller saturated region are
-    > skipped.
-    >
-    > This new feature corrects the classification of images having gradient
-    > vivid colors.
-    >
-    > Bug: 449909524
-    > Change-Id: I80fb34c028db23b667f0c66b3431522a3e31dd86
-    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7836698
-    > Commit-Queue: Stephen Chenney <schenney@chromium.org>
-    > Reviewed-by: Stephen Chenney <schenney@chromium.org>
-    > Auto-Submit: Prashant Nevase <pnevase@microsoft.com>
-    > Cr-Commit-Position: refs/heads/main@{#1629379}
-    
-    Bug: 449909524
-    Change-Id: Ic13f611b6e3a6107b13d0db94938c98c5e3d83ce
-    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7844414
-    Reviewed-by: Stephen Chenney <schenney@chromium.org>
-    Auto-Submit: Prashant Nevase <pnevase@microsoft.com>
-    Commit-Queue: Prashant Nevase <pnevase@microsoft.com>
-    Cr-Commit-Position: refs/heads/main@{#1630601}
-
-diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
-index 374d5119f853..89c70520d6b0 100644
---- a/third_party/blink/renderer/platform/BUILD.gn
-+++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -2640,6 +2640,9 @@ group("blink_platform_unittests_data") {
-     "//third_party/blink/web_tests/images/bmp-suite/",
-     "//third_party/blink/web_tests/images/jpeg-suite/",
- 
-+    # Required by dark mode image classifier tests.
-+    "//third_party/blink/web_tests/dark-mode/images/resources/",
-+
-     # Required by some font tests.
-     "//third_party/blink/web_tests/external/wpt/fonts/",
-     "//third_party/blink/web_tests/external/wpt/css/css-fonts/resources",
-diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-index 104a99c35aab..0111db051cca 100644
---- a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-+++ b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-@@ -4,6 +4,7 @@
- 
- #include "third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h"
- 
-+#include <algorithm>
- #include <array>
- #include <optional>
- #include <set>
-@@ -22,6 +23,12 @@ const float kMinOpaquePixelPercentageForForeground = 0.2;
- // Color is considered light if its luma is above this threshold.
- constexpr int kHighLightnessThreshold = 96;
- 
-+// Per-pixel chroma (max channel - min channel, in 0..255) at or above which
-+// the pixel is considered vivid / highly saturated. Tuned to count both
-+// fully saturated colors and their anti-aliased fringes, while excluding
-+// typical photographic colors which usually have chroma below 60.
-+constexpr int kHighSaturationThreshold = 80;
-+
- // Decision tree thresholds for classifying images
- 
- // Lower and upper color thresholds for grayscale and color images.
-@@ -36,6 +43,16 @@ constexpr float kFeatureTransparencyRatioThreshold = 0.4f;
- // Luminance ratio threshold above which the image is classified as light.
- constexpr float kFeatureHighLuminanceThreshold = 0.5f;
- 
-+// Saturated pixel ratio threshold above which a low-color-bucket image is
-+// considered to have a vivid-color theme and is skipped from inversion.
-+constexpr float kFeatureHighSaturationRatioThreshold = 0.3f;
-+
-+// Lower saturation threshold used together with a high luminance gate to
-+// catch images with a mostly-light field and a smaller saturated region,
-+// where the dominant light pixels pull the overall saturated_pixel_ratio
-+// below kFeatureHighSaturationRatioThreshold.
-+constexpr float kFeatureLowSaturationRatioThreshold = 0.1f;
-+
- bool IsColorGray(const SkColor& color) {
-   return abs(static_cast<int>(SkColorGetR(color)) -
-              static_cast<int>(SkColorGetG(color))) +
-@@ -56,6 +73,17 @@ bool IsColorLight(const SkColor& color) {
-   return luma >= kHighLightnessThreshold;
- }
- 
-+bool IsColorSaturated(const SkColor& color) {
-+  // Approximate HSV chroma: max(R,G,B) - min(R,G,B). A high value indicates
-+  // a vivid/saturated color, while neutral grays and pastels have a low
-+  // value.
-+  int r = SkColorGetR(color);
-+  int g = SkColorGetG(color);
-+  int b = SkColorGetB(color);
-+  int chroma = std::max({r, g, b}) - std::min({r, g, b});
-+  return chroma >= kHighSaturationThreshold;
-+}
-+
- }  // namespace
- 
- DarkModeImageClassifier::DarkModeImageClassifier() = default;
-@@ -200,6 +228,7 @@ DarkModeImageClassifier::Features DarkModeImageClassifier::ComputeFeatures(
- 
-   int color_pixels = 0;
-   int high_luma_pixels = 0;
-+  int saturated_pixels = 0;
-   for (const SkColor& sample : sampled_pixels) {
-     if (!IsColorGray(sample)) {
-       color_pixels++;
-@@ -208,6 +237,10 @@ DarkModeImageClassifier::Features DarkModeImageClassifier::ComputeFeatures(
-     if (IsColorLight(sample)) {
-       high_luma_pixels++;
-     }
-+
-+    if (IsColorSaturated(sample)) {
-+      saturated_pixels++;
-+    }
-   }
- 
-   ColorMode color_mode = (color_pixels > samples_count / 100)
-@@ -222,6 +255,8 @@ DarkModeImageClassifier::Features DarkModeImageClassifier::ComputeFeatures(
-   features.background_ratio = background_ratio;
-   features.high_luminance_ratio =
-       static_cast<float>(high_luma_pixels) / samples_count;
-+  features.saturated_pixel_ratio =
-+      static_cast<float>(saturated_pixels) / samples_count;
- 
-   return features;
- }
-@@ -294,6 +329,31 @@ DarkModeResult DarkModeImageClassifier::ClassifyUsingDecisionTree(
-     return DarkModeResult::kDoNotApplyFilter;
-   }
- 
-+  // Skip filtering for images with a limited palette dominated by highly
-+  // saturated colors. Inverting such images would replace their semantic
-+  // colors with the complements, which is usually wrong (a saturated red
-+  // should not become teal). Use the upper bucket threshold to remain
-+  // robust to compression artifacts that can inflate the bucket count.
-+  if (features.is_colorful &&
-+      features.color_buckets_ratio <
-+          kFeatureHighColorCountThreshold[features.is_colorful] &&
-+      features.saturated_pixel_ratio > kFeatureHighSaturationRatioThreshold) {
-+    return DarkModeResult::kDoNotApplyFilter;
-+  }
-+
-+  // Also skip images with a mostly-light field and a smaller saturated
-+  // region. These have a low overall saturated_pixel_ratio because light
-+  // pixels dominate, but the combination of few colors, high luminance, and
-+  // some saturated content indicates an asset whose colors carry meaning
-+  // and should be preserved rather than inverted.
-+  if (features.is_colorful &&
-+      features.color_buckets_ratio <
-+          kFeatureHighColorCountThreshold[features.is_colorful] &&
-+      features.high_luminance_ratio > kFeatureHighLuminanceThreshold &&
-+      features.saturated_pixel_ratio > kFeatureLowSaturationRatioThreshold) {
-+    return DarkModeResult::kDoNotApplyFilter;
-+  }
-+
-   // Very few colors means it's not a photo, apply the filter.
-   if (features.color_buckets_ratio <
-       kFeatureLowColorCountThreshold[features.is_colorful]) {
-diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h
-index fcf37ba4b054..e04a437d223a 100644
---- a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h
-+++ b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h
-@@ -42,6 +42,11 @@ class PLATFORM_EXPORT DarkModeImageClassifier {
- 
-     // Ratio of high luminance pixels to all sampled pixels in the image.
-     float high_luminance_ratio;
-+
-+    // Ratio of highly saturated (vivid) pixels to all sampled pixels in the
-+    // image. Used to detect images dominated by vivid flat colors whose
-+    // colors carry meaning and should be preserved rather than inverted.
-+    float saturated_pixel_ratio;
-   };
- 
-   DarkModeResult Classify(const SkPixmap& pixmap, const SkIRect& src) const;
-diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier_test.cc b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier_test.cc
-index e634550498a7..6ec427db1d72 100644
---- a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier_test.cc
-+++ b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier_test.cc
-@@ -13,13 +13,29 @@
- #include "third_party/blink/renderer/platform/testing/testing_platform_support.h"
- #include "third_party/blink/renderer/platform/testing/unit_test_helpers.h"
- #include "third_party/blink/renderer/platform/wtf/shared_buffer.h"
-+#include "third_party/skia/include/core/SkBitmap.h"
- #include "third_party/skia/include/core/SkCanvas.h"
-+#include "third_party/skia/include/core/SkColor.h"
- 
- namespace blink {
- namespace {
- 
- const float kEpsilon = 0.00001;
- 
-+SkBitmap MakeStripedBitmap(SkColor background,
-+                           SkColor foreground,
-+                           int foreground_x,
-+                           int foreground_width) {
-+  SkBitmap bitmap;
-+  bitmap.allocN32Pixels(100, 100);
-+  bitmap.eraseColor(background);
-+  if (foreground_width > 0) {
-+    bitmap.erase(foreground,
-+                 SkIRect::MakeXYWH(foreground_x, 0, foreground_width, 100));
-+  }
-+  return bitmap;
-+}
-+
- }  // namespace
- 
- class DarkModeImageClassifierTest : public testing::Test {
-@@ -405,7 +421,7 @@ TEST_F(DarkModeImageClassifierTest, FeaturesAndClassification) {
-   // Test Case 5:
-   // Color
-   // Color Buckets Ratio: Medium
--  // Decision Tree: Apply
-+  // Decision Tree: Do Not Apply
-   // Neural Network: NA.
-   image = GetImage("/images/resources/ycbcr-444-float.jpg");
-   bitmap = image->AsSkBitmapForCurrentFrame(kDoNotRespectImageOrientation);
-@@ -415,9 +431,9 @@ TEST_F(DarkModeImageClassifierTest, FeaturesAndClassification) {
-                                SkIRect::MakeWH(image->width(), image->height()))
-                  .value();
-   EXPECT_EQ(image_classifier()->ClassifyWithFeatures(features),
--            DarkModeResult::kApplyFilter);
-+            DarkModeResult::kDoNotApplyFilter);
-   EXPECT_EQ(image_classifier()->ClassifyUsingDecisionTree(features),
--            DarkModeResult::kApplyFilter);
-+            DarkModeResult::kDoNotApplyFilter);
-   EXPECT_TRUE(features.is_colorful);
-   EXPECT_NEAR(0.0151367f, features.color_buckets_ratio, kEpsilon);
-   EXPECT_NEAR(0.0f, features.transparency_ratio, kEpsilon);
-@@ -425,4 +441,55 @@ TEST_F(DarkModeImageClassifierTest, FeaturesAndClassification) {
-   EXPECT_NEAR(0.9255555272102356f, features.high_luminance_ratio, kEpsilon);
- }
- 
-+TEST_F(DarkModeImageClassifierTest, ImageWithHighlySaturatedColors) {
-+  scoped_refptr<BitmapImage> image =
-+      GetImage("/dark-mode/images/resources/country-flags-sprite.png");
-+  SkBitmap bitmap =
-+      image->AsSkBitmapForCurrentFrame(kDoNotRespectImageOrientation);
-+  SkPixmap pixmap;
-+  bitmap.peekPixels(&pixmap);
-+
-+  EXPECT_EQ(
-+      image_classifier()->Classify(pixmap, SkIRect::MakeXYWH(0, 192, 48, 32)),
-+      DarkModeResult::kDoNotApplyFilter);
-+
-+  EXPECT_EQ(
-+      image_classifier()->Classify(pixmap, SkIRect::MakeXYWH(0, 48, 48, 32)),
-+      DarkModeResult::kDoNotApplyFilter);
-+}
-+
-+TEST_F(DarkModeImageClassifierTest,
-+       SyntheticImageWithTransparentBackgroundLightForeground) {
-+  // Image with mostly-transparent background and predominantly light foreground
-+  // pixels.
-+  SkBitmap bitmap =
-+      MakeStripedBitmap(SK_ColorTRANSPARENT, SK_ColorWHITE, 50, 50);
-+  SkPixmap pixmap;
-+  ASSERT_TRUE(bitmap.peekPixels(&pixmap));
-+  EXPECT_EQ(image_classifier()->Classify(pixmap, bitmap.bounds()),
-+            DarkModeResult::kDoNotApplyFilter);
-+}
-+
-+TEST_F(DarkModeImageClassifierTest,
-+       SyntheticImageWithFullySaturatedBackground) {
-+  // Colorful, low-palette image with a saturated-dominant pixel distribution
-+  // (e.g. dominated by vivid flat colors)
-+  SkBitmap bitmap = MakeStripedBitmap(SK_ColorRED, SK_ColorRED, 0, 0);
-+  SkPixmap pixmap;
-+  ASSERT_TRUE(bitmap.peekPixels(&pixmap));
-+  EXPECT_EQ(image_classifier()->Classify(pixmap, bitmap.bounds()),
-+            DarkModeResult::kDoNotApplyFilter);
-+}
-+
-+TEST_F(DarkModeImageClassifierTest,
-+       SyntheticImageWithLightBackgroundAndSaturatedForeground) {
-+  // Colorful, mostly-light image with a smaller saturated region (e.g.
-+  // light-field image with a smaller area of vivid colors).
-+  SkBitmap bitmap = MakeStripedBitmap(SK_ColorWHITE, SK_ColorRED, 0, 15);
-+  SkPixmap pixmap;
-+  ASSERT_TRUE(bitmap.peekPixels(&pixmap));
-+  EXPECT_EQ(image_classifier()->Classify(pixmap, bitmap.bounds()),
-+            DarkModeResult::kDoNotApplyFilter);
-+}
-+
- }  // namespace blink
-diff --git a/third_party/blink/web_tests/dark-mode/images/country-flags-expected.png b/third_party/blink/web_tests/dark-mode/images/country-flags-expected.png
-new file mode 100644
-index 000000000000..28cea1997bd1
-Binary files /dev/null and b/third_party/blink/web_tests/dark-mode/images/country-flags-expected.png differ
-diff --git a/third_party/blink/web_tests/dark-mode/images/country-flags.html b/third_party/blink/web_tests/dark-mode/images/country-flags.html
-new file mode 100644
-index 000000000000..86a8e139428a
---- /dev/null
-+++ b/third_party/blink/web_tests/dark-mode/images/country-flags.html
-@@ -0,0 +1,520 @@
-+<!DOCTYPE html>
-+<style>
-+body { font: 12px system-ui, sans-serif; padding: 0px; }
-+ul {
-+  list-style: none;
-+  padding: 0px;
-+  display: grid;
-+  grid-template-columns: repeat(16, max-content);
-+  gap: 0px 0px;
-+}
-+li { display: flex; align-items: center; }
-+.flag {
-+  display: inline-block;
-+  width: 32px;
-+  height: 28px;
-+  margin: 0px;
-+  background-image: url('resources/country-flags-sprite.png');
-+  background-repeat: no-repeat;
-+}
-+.flag-afghanistan { background-position: -0px -0px; }
-+.flag-aland-islands { background-position: -48px -0px; }
-+.flag-albania { background-position: -96px -0px; }
-+.flag-algeria { background-position: -144px -0px; }
-+.flag-american-samoa { background-position: -192px -0px; }
-+.flag-andorra { background-position: -240px -0px; }
-+.flag-angola { background-position: -288px -0px; }
-+.flag-anguilla { background-position: -336px -0px; }
-+.flag-antigua-and-barbuda { background-position: -384px -0px; }
-+.flag-argentina { background-position: -432px -0px; }
-+.flag-armenia { background-position: -480px -0px; }
-+.flag-aruba { background-position: -528px -0px; }
-+.flag-australia { background-position: -576px -0px; }
-+.flag-austria { background-position: -624px -0px; }
-+.flag-azerbaijan { background-position: -672px -0px; }
-+.flag-bahrain { background-position: -720px -0px; }
-+.flag-bangladesh { background-position: -0px -32px; }
-+.flag-barbados { background-position: -48px -32px; }
-+.flag-belarus { background-position: -96px -32px; }
-+.flag-belgium { background-position: -144px -32px; }
-+.flag-belize { background-position: -192px -32px; }
-+.flag-benin { background-position: -240px -32px; }
-+.flag-bermuda { background-position: -288px -32px; }
-+.flag-bhutan { background-position: -336px -32px; }
-+.flag-bolivia { background-position: -384px -32px; }
-+.flag-bonaire { background-position: -432px -32px; }
-+.flag-bosnia-and-herzegovina { background-position: -480px -32px; }
-+.flag-botswana { background-position: -528px -32px; }
-+.flag-bouvet-island { background-position: -576px -32px; }
-+.flag-brazil { background-position: -624px -32px; }
-+.flag-british-indian-ocean-territory {
-+  background-position: -672px -32px;
-+}
-+.flag-british-virgin-islands { background-position: -720px -32px; }
-+.flag-brunei { background-position: -0px -64px; }
-+.flag-bulgaria { background-position: -48px -64px; }
-+.flag-burkina-faso { background-position: -96px -64px; }
-+.flag-burundi { background-position: -144px -64px; }
-+.flag-cambodia { background-position: -192px -64px; }
-+.flag-cameroon { background-position: -240px -64px; }
-+.flag-canada { background-position: -288px -64px; }
-+.flag-cape-verde { background-position: -336px -64px; }
-+.flag-cayman-islands { background-position: -384px -64px; }
-+.flag-central-african-republic { background-position: -432px -64px; }
-+.flag-chad { background-position: -480px -64px; }
-+.flag-chile { background-position: -528px -64px; }
-+.flag-china { background-position: -576px -64px; }
-+.flag-christmas-island { background-position: -624px -64px; }
-+.flag-cocos-(keeling)-islands { background-position: -672px -64px; }
-+.flag-colombia { background-position: -720px -64px; }
-+.flag-comoros { background-position: -0px -96px; }
-+.flag-cook-islands { background-position: -48px -96px; }
-+.flag-costa-rica { background-position: -96px -96px; }
-+.flag-croatia { background-position: -144px -96px; }
-+.flag-cuba { background-position: -192px -96px; }
-+.flag-curacao { background-position: -240px -96px; }
-+.flag-cyprus { background-position: -288px -96px; }
-+.flag-czech-republic { background-position: -336px -96px; }
-+.flag-democratic-republic-of-the-congo {
-+  background-position: -384px -96px;
-+}
-+.flag-denmark { background-position: -432px -96px; }
-+.flag-djibouti { background-position: -480px -96px; }
-+.flag-dominica { background-position: -528px -96px; }
-+.flag-dominican-republic { background-position: -576px -96px; }
-+.flag-ecuador { background-position: -624px -96px; }
-+.flag-egypt { background-position: -672px -96px; }
-+.flag-el-salvador { background-position: -720px -96px; }
-+.flag-equatorial-guinea { background-position: -0px -128px; }
-+.flag-eritrea { background-position: -48px -128px; }
-+.flag-estonia { background-position: -96px -128px; }
-+.flag-ethiopia { background-position: -144px -128px; }
-+.flag-falkland-islands { background-position: -192px -128px; }
-+.flag-faroe-islands { background-position: -240px -128px; }
-+.flag-fiji { background-position: -288px -128px; }
-+.flag-finland { background-position: -336px -128px; }
-+.flag-france { background-position: -384px -128px; }
-+.flag-french-guiana { background-position: -432px -128px; }
-+.flag-french-polynesia { background-position: -480px -128px; }
-+.flag-gabon { background-position: -528px -128px; }
-+.flag-gambia { background-position: -576px -128px; }
-+.flag-georgia { background-position: -624px -128px; }
-+.flag-germany { background-position: -672px -128px; }
-+.flag-ghana { background-position: -720px -128px; }
-+.flag-gibraltar { background-position: -0px -160px; }
-+.flag-greece { background-position: -48px -160px; }
-+.flag-greenland { background-position: -96px -160px; }
-+.flag-grenada { background-position: -144px -160px; }
-+.flag-guadeloupe { background-position: -192px -160px; }
-+.flag-guam { background-position: -240px -160px; }
-+.flag-guatemala { background-position: -288px -160px; }
-+.flag-guernsey { background-position: -336px -160px; }
-+.flag-guinea-bissau { background-position: -384px -160px; }
-+.flag-guinea { background-position: -432px -160px; }
-+.flag-guyana { background-position: -480px -160px; }
-+.flag-haiti { background-position: -528px -160px; }
-+.flag-honduras { background-position: -576px -160px; }
-+.flag-hong-kong { background-position: -624px -160px; }
-+.flag-hungary { background-position: -672px -160px; }
-+.flag-iceland { background-position: -720px -160px; }
-+.flag-india { background-position: -0px -192px; }
-+.flag-indonesia { background-position: -48px -192px; }
-+.flag-iran { background-position: -96px -192px; }
-+.flag-iraq { background-position: -144px -192px; }
-+.flag-ireland { background-position: -192px -192px; }
-+.flag-isle-of-man { background-position: -240px -192px; }
-+.flag-israel { background-position: -288px -192px; }
-+.flag-italy { background-position: -336px -192px; }
-+.flag-ivory-coast { background-position: -384px -192px; }
-+.flag-jamaica { background-position: -432px -192px; }
-+.flag-japan { background-position: -480px -192px; }
-+.flag-jersey { background-position: -528px -192px; }
-+.flag-jordan { background-position: -576px -192px; }
-+.flag-kazakhstan { background-position: -624px -192px; }
-+.flag-kenya { background-position: -672px -192px; }
-+.flag-kiribati { background-position: -720px -192px; }
-+.flag-kosovo { background-position: -0px -224px; }
-+.flag-kuwait { background-position: -48px -224px; }
-+.flag-kyrgyzstan { background-position: -96px -224px; }
-+.flag-laos { background-position: -144px -224px; }
-+.flag-latvia { background-position: -192px -224px; }
-+.flag-lebanon { background-position: -240px -224px; }
-+.flag-lesotho { background-position: -288px -224px; }
-+.flag-liberia { background-position: -336px -224px; }
-+.flag-libya { background-position: -384px -224px; }
-+.flag-liechtenstein { background-position: -432px -224px; }
-+.flag-lithuania { background-position: -480px -224px; }
-+.flag-luxembourg { background-position: -528px -224px; }
-+.flag-macau { background-position: -576px -224px; }
-+.flag-madagascar { background-position: -624px -224px; }
-+.flag-malawi { background-position: -672px -224px; }
-+.flag-malaysia { background-position: -720px -224px; }
-+.flag-maldives { background-position: -0px -256px; }
-+.flag-mali { background-position: -48px -256px; }
-+.flag-malta { background-position: -96px -256px; }
-+.flag-marshall-islands { background-position: -144px -256px; }
-+.flag-martinique { background-position: -192px -256px; }
-+.flag-mauritania { background-position: -240px -256px; }
-+.flag-mauritius { background-position: -288px -256px; }
-+.flag-mayotte { background-position: -336px -256px; }
-+.flag-mexico { background-position: -384px -256px; }
-+.flag-micronesia { background-position: -432px -256px; }
-+.flag-moldova { background-position: -480px -256px; }
-+.flag-monaco { background-position: -528px -256px; }
-+.flag-mongolia { background-position: -576px -256px; }
-+.flag-montenegro { background-position: -624px -256px; }
-+.flag-montserrat { background-position: -672px -256px; }
-+.flag-morocco { background-position: -720px -256px; }
-+.flag-mozambique { background-position: -0px -288px; }
-+.flag-myanmar-(burma) { background-position: -48px -288px; }
-+.flag-namibia { background-position: -96px -288px; }
-+.flag-nauru { background-position: -144px -288px; }
-+.flag-nepal { background-position: -192px -288px; }
-+.flag-netherlands { background-position: -240px -288px; }
-+.flag-new-caledonia { background-position: -288px -288px; }
-+.flag-new-zealand { background-position: -336px -288px; }
-+.flag-nicaragua { background-position: -384px -288px; }
-+.flag-niger { background-position: -432px -288px; }
-+.flag-nigeria { background-position: -480px -288px; }
-+.flag-niue { background-position: -528px -288px; }
-+.flag-norfolk-island { background-position: -576px -288px; }
-+.flag-north-korea { background-position: -624px -288px; }
-+.flag-northern-mariana-islands { background-position: -672px -288px; }
-+.flag-norway { background-position: -720px -288px; }
-+.flag-oman { background-position: -0px -320px; }
-+.flag-pakistan { background-position: -48px -320px; }
-+.flag-palau { background-position: -96px -320px; }
-+.flag-palestine { background-position: -144px -320px; }
-+.flag-panama { background-position: -192px -320px; }
-+.flag-papua-new-guinea { background-position: -240px -320px; }
-+.flag-paraguay { background-position: -288px -320px; }
-+.flag-peru { background-position: -336px -320px; }
-+.flag-philippines { background-position: -384px -320px; }
-+.flag-pitcairn-islands { background-position: -432px -320px; }
-+.flag-poland { background-position: -480px -320px; }
-+.flag-portugal { background-position: -528px -320px; }
-+.flag-puerto-rico { background-position: -576px -320px; }
-+.flag-qatar { background-position: -624px -320px; }
-+.flag-republic-of-the-congo { background-position: -672px -320px; }
-+.flag-reunion { background-position: -720px -320px; }
-+.flag-romania { background-position: -0px -352px; }
-+.flag-russia { background-position: -48px -352px; }
-+.flag-rwanda { background-position: -96px -352px; }
-+.flag-saint-barthelemy { background-position: -144px -352px; }
-+.flag-saint-helena { background-position: -192px -352px; }
-+.flag-saint-kitts-and-nevis { background-position: -240px -352px; }
-+.flag-saint-lucia { background-position: -288px -352px; }
-+.flag-saint-martin { background-position: -336px -352px; }
-+.flag-saint-pierre-and-miquelon { background-position: -384px -352px; }
-+.flag-saint-vincent-and-the-grenadines {
-+  background-position: -432px -352px;
-+}
-+.flag-samoa { background-position: -480px -352px; }
-+.flag-san-marino { background-position: -528px -352px; }
-+.flag-sao-tome-and-principe { background-position: -576px -352px; }
-+.flag-saudi-arabia { background-position: -624px -352px; }
-+.flag-senegal { background-position: -672px -352px; }
-+.flag-serbia { background-position: -720px -352px; }
-+.flag-seychelles { background-position: -0px -384px; }
-+.flag-sierra-leone { background-position: -48px -384px; }
-+.flag-singapore { background-position: -96px -384px; }
-+.flag-sint-maarten { background-position: -144px -384px; }
-+.flag-slovakia { background-position: -192px -384px; }
-+.flag-slovenia { background-position: -240px -384px; }
-+.flag-solomon-islands { background-position: -288px -384px; }
-+.flag-somalia { background-position: -336px -384px; }
-+.flag-south-africa { background-position: -384px -384px; }
-+.flag-south-georgia-and-the-south-sandwich-islands {
-+  background-position: -432px -384px;
-+}
-+.flag-south-korea { background-position: -480px -384px; }
-+.flag-south-sudan { background-position: -528px -384px; }
-+.flag-spain { background-position: -576px -384px; }
-+.flag-sri-lanka { background-position: -624px -384px; }
-+.flag-sudan { background-position: -672px -384px; }
-+.flag-suriname { background-position: -720px -384px; }
-+.flag-svalbard-and-jan-mayen { background-position: -0px -416px; }
-+.flag-sweden { background-position: -48px -416px; }
-+.flag-switzerland { background-position: -96px -416px; }
-+.flag-syria { background-position: -144px -416px; }
-+.flag-taiwan { background-position: -192px -416px; }
-+.flag-tajikistan { background-position: -240px -416px; }
-+.flag-tanzania { background-position: -288px -416px; }
-+.flag-thailand { background-position: -336px -416px; }
-+.flag-the-bahamas { background-position: -384px -416px; }
-+.flag-timor-leste { background-position: -432px -416px; }
-+.flag-togo { background-position: -480px -416px; }
-+.flag-tokelau { background-position: -528px -416px; }
-+.flag-tonga { background-position: -576px -416px; }
-+.flag-trinidad-and-tobago { background-position: -624px -416px; }
-+.flag-tunisia { background-position: -672px -416px; }
-+.flag-turkey { background-position: -720px -416px; }
-+.flag-turkmenistan { background-position: -0px -448px; }
-+.flag-turks-and-caicos-islands { background-position: -48px -448px; }
-+.flag-tuvalu { background-position: -96px -448px; }
-+.flag-uganda { background-position: -144px -448px; }
-+.flag-ukraine { background-position: -192px -448px; }
-+.flag-united-arab-emirates { background-position: -240px -448px; }
-+.flag-united-kingdom { background-position: -288px -448px; }
-+.flag-united-states-of-america { background-position: -336px -448px; }
-+.flag-uruguay { background-position: -384px -448px; }
-+.flag-us-virgin-islands { background-position: -432px -448px; }
-+.flag-uzbekistan { background-position: -480px -448px; }
-+.flag-vanuatu { background-position: -528px -448px; }
-+.flag-vatican-city { background-position: -576px -448px; }
-+.flag-venezuela { background-position: -624px -448px; }
-+.flag-vietnam { background-position: -672px -448px; }
-+.flag-wallis-and-futuna { background-position: -720px -448px; }
-+.flag-western-sahara { background-position: -0px -480px; }
-+.flag-yemen { background-position: -48px -480px; }
-+.flag-zambia { background-position: -96px -480px; }
-+.flag-zimbabwe { background-position: -144px -480px; }
-+</style>
-+
-+
-+<ul>
-+  <li><span class="flag flag-afghanistan"></span></li>
-+  <li><span class="flag flag-aland-islands"></span></li>
-+  <li><span class="flag flag-albania"></span></li>
-+  <li><span class="flag flag-algeria"></span></li>
-+  <li><span class="flag flag-american-samoa"></span></li>
-+  <li><span class="flag flag-andorra"></span></li>
-+  <li><span class="flag flag-angola"></span></li>
-+  <li><span class="flag flag-anguilla"></span></li>
-+  <li><span class="flag flag-antigua-and-barbuda"></span></li>
-+  <li><span class="flag flag-argentina"></span></li>
-+  <li><span class="flag flag-armenia"></span></li>
-+  <li><span class="flag flag-aruba"></span></li>
-+  <li><span class="flag flag-australia"></span></li>
-+  <li><span class="flag flag-austria"></span></li>
-+  <li><span class="flag flag-azerbaijan"></span></li>
-+  <li><span class="flag flag-bahrain"></span></li>
-+  <li><span class="flag flag-bangladesh"></span></li>
-+  <li><span class="flag flag-barbados"></span></li>
-+  <li><span class="flag flag-belarus"></span></li>
-+  <li><span class="flag flag-belgium"></span></li>
-+  <li><span class="flag flag-belize"></span></li>
-+  <li><span class="flag flag-benin"></span></li>
-+  <li><span class="flag flag-bermuda"></span></li>
-+  <li><span class="flag flag-bhutan"></span></li>
-+  <li><span class="flag flag-bolivia"></span></li>
-+  <li><span class="flag flag-bonaire"></span></li>
-+  <li><span class="flag flag-bosnia-and-herzegovina"></span></li>
-+  <li><span class="flag flag-botswana"></span></li>
-+  <li><span class="flag flag-bouvet-island"></span></li>
-+  <li><span class="flag flag-brazil"></span></li>
-+  <li><span class="flag flag-british-indian-ocean-territory"></span></li>
-+  <li><span class="flag flag-british-virgin-islands"></span></li>
-+  <li><span class="flag flag-brunei"></span></li>
-+  <li><span class="flag flag-bulgaria"></span></li>
-+  <li><span class="flag flag-burkina-faso"></span></li>
-+  <li><span class="flag flag-burundi"></span></li>
-+  <li><span class="flag flag-cambodia"></span></li>
-+  <li><span class="flag flag-cameroon"></span></li>
-+  <li><span class="flag flag-canada"></span></li>
-+  <li><span class="flag flag-cape-verde"></span></li>
-+  <li><span class="flag flag-cayman-islands"></span></li>
-+  <li><span class="flag flag-central-african-republic"></span></li>
-+  <li><span class="flag flag-chad"></span></li>
-+  <li><span class="flag flag-chile"></span></li>
-+  <li><span class="flag flag-china"></span></li>
-+  <li><span class="flag flag-christmas-island"></span></li>
-+  <li><span class="flag flag-cocos-(keeling)-islands"></span></li>
-+  <li><span class="flag flag-colombia"></span></li>
-+  <li><span class="flag flag-comoros"></span></li>
-+  <li><span class="flag flag-cook-islands"></span></li>
-+  <li><span class="flag flag-costa-rica"></span></li>
-+  <li><span class="flag flag-croatia"></span></li>
-+  <li><span class="flag flag-cuba"></span></li>
-+  <li><span class="flag flag-curacao"></span></li>
-+  <li><span class="flag flag-cyprus"></span></li>
-+  <li><span class="flag flag-czech-republic"></span></li>
-+  <li><span class="flag flag-democratic-republic-of-the-congo"></span></li>
-+  <li><span class="flag flag-denmark"></span></li>
-+  <li><span class="flag flag-djibouti"></span></li>
-+  <li><span class="flag flag-dominica"></span></li>
-+  <li><span class="flag flag-dominican-republic"></span></li>
-+  <li><span class="flag flag-ecuador"></span></li>
-+  <li><span class="flag flag-egypt"></span></li>
-+  <li><span class="flag flag-el-salvador"></span></li>
-+  <li><span class="flag flag-equatorial-guinea"></span></li>
-+  <li><span class="flag flag-eritrea"></span></li>
-+  <li><span class="flag flag-estonia"></span></li>
-+  <li><span class="flag flag-ethiopia"></span></li>
-+  <li><span class="flag flag-falkland-islands"></span></li>
-+  <li><span class="flag flag-faroe-islands"></span></li>
-+  <li><span class="flag flag-fiji"></span></li>
-+  <li><span class="flag flag-finland"></span></li>
-+  <li><span class="flag flag-france"></span></li>
-+  <li><span class="flag flag-french-guiana"></span></li>
-+  <li><span class="flag flag-french-polynesia"></span></li>
-+  <li><span class="flag flag-gabon"></span></li>
-+  <li><span class="flag flag-gambia"></span></li>
-+  <li><span class="flag flag-georgia"></span></li>
-+  <li><span class="flag flag-germany"></span></li>
-+  <li><span class="flag flag-ghana"></span></li>
-+  <li><span class="flag flag-gibraltar"></span></li>
-+  <li><span class="flag flag-greece"></span></li>
-+  <li><span class="flag flag-greenland"></span></li>
-+  <li><span class="flag flag-grenada"></span></li>
-+  <li><span class="flag flag-guadeloupe"></span></li>
-+  <li><span class="flag flag-guam"></span></li>
-+  <li><span class="flag flag-guatemala"></span></li>
-+  <li><span class="flag flag-guernsey"></span></li>
-+  <li><span class="flag flag-guinea-bissau"></span></li>
-+  <li><span class="flag flag-guinea"></span></li>
-+  <li><span class="flag flag-guyana"></span></li>
-+  <li><span class="flag flag-haiti"></span></li>
-+  <li><span class="flag flag-honduras"></span></li>
-+  <li><span class="flag flag-hong-kong"></span></li>
-+  <li><span class="flag flag-hungary"></span></li>
-+  <li><span class="flag flag-iceland"></span></li>
-+  <li><span class="flag flag-india"></span></li>
-+  <li><span class="flag flag-indonesia"></span></li>
-+  <li><span class="flag flag-iran"></span></li>
-+  <li><span class="flag flag-iraq"></span></li>
-+  <li><span class="flag flag-ireland"></span></li>
-+  <li><span class="flag flag-isle-of-man"></span></li>
-+  <li><span class="flag flag-israel"></span></li>
-+  <li><span class="flag flag-italy"></span></li>
-+  <li><span class="flag flag-ivory-coast"></span></li>
-+  <li><span class="flag flag-jamaica"></span></li>
-+  <li><span class="flag flag-japan"></span></li>
-+  <li><span class="flag flag-jersey"></span></li>
-+  <li><span class="flag flag-jordan"></span></li>
-+  <li><span class="flag flag-kazakhstan"></span></li>
-+  <li><span class="flag flag-kenya"></span></li>
-+  <li><span class="flag flag-kiribati"></span></li>
-+  <li><span class="flag flag-kosovo"></span></li>
-+  <li><span class="flag flag-kuwait"></span></li>
-+  <li><span class="flag flag-kyrgyzstan"></span></li>
-+  <li><span class="flag flag-laos"></span></li>
-+  <li><span class="flag flag-latvia"></span></li>
-+  <li><span class="flag flag-lebanon"></span></li>
-+  <li><span class="flag flag-lesotho"></span></li>
-+  <li><span class="flag flag-liberia"></span></li>
-+  <li><span class="flag flag-libya"></span></li>
-+  <li><span class="flag flag-liechtenstein"></span></li>
-+  <li><span class="flag flag-lithuania"></span></li>
-+  <li><span class="flag flag-luxembourg"></span></li>
-+  <li><span class="flag flag-macau"></span></li>
-+  <li><span class="flag flag-madagascar"></span></li>
-+  <li><span class="flag flag-malawi"></span></li>
-+  <li><span class="flag flag-malaysia"></span></li>
-+  <li><span class="flag flag-maldives"></span></li>
-+  <li><span class="flag flag-mali"></span></li>
-+  <li><span class="flag flag-malta"></span></li>
-+  <li><span class="flag flag-marshall-islands"></span></li>
-+  <li><span class="flag flag-martinique"></span></li>
-+  <li><span class="flag flag-mauritania"></span></li>
-+  <li><span class="flag flag-mauritius"></span></li>
-+  <li><span class="flag flag-mayotte"></span></li>
-+  <li><span class="flag flag-mexico"></span></li>
-+  <li><span class="flag flag-micronesia"></span></li>
-+  <li><span class="flag flag-moldova"></span></li>
-+  <li><span class="flag flag-monaco"></span></li>
-+  <li><span class="flag flag-mongolia"></span></li>
-+  <li><span class="flag flag-montenegro"></span></li>
-+  <li><span class="flag flag-montserrat"></span></li>
-+  <li><span class="flag flag-morocco"></span></li>
-+  <li><span class="flag flag-mozambique"></span></li>
-+  <li><span class="flag flag-myanmar-(burma)"></span></li>
-+  <li><span class="flag flag-namibia"></span></li>
-+  <li><span class="flag flag-nauru"></span></li>
-+  <li><span class="flag flag-nepal"></span></li>
-+  <li><span class="flag flag-netherlands"></span></li>
-+  <li><span class="flag flag-new-caledonia"></span></li>
-+  <li><span class="flag flag-new-zealand"></span></li>
-+  <li><span class="flag flag-nicaragua"></span></li>
-+  <li><span class="flag flag-niger"></span></li>
-+  <li><span class="flag flag-nigeria"></span></li>
-+  <li><span class="flag flag-niue"></span></li>
-+  <li><span class="flag flag-norfolk-island"></span></li>
-+  <li><span class="flag flag-north-korea"></span></li>
-+  <li><span class="flag flag-northern-mariana-islands"></span></li>
-+  <li><span class="flag flag-norway"></span></li>
-+  <li><span class="flag flag-oman"></span></li>
-+  <li><span class="flag flag-pakistan"></span></li>
-+  <li><span class="flag flag-palau"></span></li>
-+  <li><span class="flag flag-palestine"></span></li>
-+  <li><span class="flag flag-panama"></span></li>
-+  <li><span class="flag flag-papua-new-guinea"></span></li>
-+  <li><span class="flag flag-paraguay"></span></li>
-+  <li><span class="flag flag-peru"></span></li>
-+  <li><span class="flag flag-philippines"></span></li>
-+  <li><span class="flag flag-pitcairn-islands"></span></li>
-+  <li><span class="flag flag-poland"></span></li>
-+  <li><span class="flag flag-portugal"></span></li>
-+  <li><span class="flag flag-puerto-rico"></span></li>
-+  <li><span class="flag flag-qatar"></span></li>
-+  <li><span class="flag flag-republic-of-the-congo"></span></li>
-+  <li><span class="flag flag-reunion"></span></li>
-+  <li><span class="flag flag-romania"></span></li>
-+  <li><span class="flag flag-russia"></span></li>
-+  <li><span class="flag flag-rwanda"></span></li>
-+  <li><span class="flag flag-saint-barthelemy"></span></li>
-+  <li><span class="flag flag-saint-helena"></span></li>
-+  <li><span class="flag flag-saint-kitts-and-nevis"></span></li>
-+  <li><span class="flag flag-saint-lucia"></span></li>
-+  <li><span class="flag flag-saint-martin"></span></li>
-+  <li><span class="flag flag-saint-pierre-and-miquelon"></span></li>
-+  <li><span class="flag flag-saint-vincent-and-the-grenadines"></span></li>
-+  <li><span class="flag flag-samoa"></span></li>
-+  <li><span class="flag flag-san-marino"></span></li>
-+  <li><span class="flag flag-sao-tome-and-principe"></span></li>
-+  <li><span class="flag flag-saudi-arabia"></span></li>
-+  <li><span class="flag flag-senegal"></span></li>
-+  <li><span class="flag flag-serbia"></span></li>
-+  <li><span class="flag flag-seychelles"></span></li>
-+  <li><span class="flag flag-sierra-leone"></span></li>
-+  <li><span class="flag flag-singapore"></span></li>
-+  <li><span class="flag flag-sint-maarten"></span></li>
-+  <li><span class="flag flag-slovakia"></span></li>
-+  <li><span class="flag flag-slovenia"></span></li>
-+  <li><span class="flag flag-solomon-islands"></span></li>
-+  <li><span class="flag flag-somalia"></span></li>
-+  <li><span class="flag flag-south-africa"></span></li>
-+  <li><span class="flag flag-south-georgia-and-the-south-sandwich-islands"></span></li>
-+  <li><span class="flag flag-south-korea"></span></li>
-+  <li><span class="flag flag-south-sudan"></span></li>
-+  <li><span class="flag flag-spain"></span></li>
-+  <li><span class="flag flag-sri-lanka"></span></li>
-+  <li><span class="flag flag-sudan"></span></li>
-+  <li><span class="flag flag-suriname"></span></li>
-+  <li><span class="flag flag-svalbard-and-jan-mayen"></span></li>
-+  <li><span class="flag flag-sweden"></span></li>
-+  <li><span class="flag flag-switzerland"></span></li>
-+  <li><span class="flag flag-syria"></span></li>
-+  <li><span class="flag flag-taiwan"></span></li>
-+  <li><span class="flag flag-tajikistan"></span></li>
-+  <li><span class="flag flag-tanzania"></span></li>
-+  <li><span class="flag flag-thailand"></span></li>
-+  <li><span class="flag flag-the-bahamas"></span></li>
-+  <li><span class="flag flag-timor-leste"></span></li>
-+  <li><span class="flag flag-togo"></span></li>
-+  <li><span class="flag flag-tokelau"></span></li>
-+  <li><span class="flag flag-tonga"></span></li>
-+  <li><span class="flag flag-trinidad-and-tobago"></span></li>
-+  <li><span class="flag flag-tunisia"></span></li>
-+  <li><span class="flag flag-turkey"></span></li>
-+  <li><span class="flag flag-turkmenistan"></span></li>
-+  <li><span class="flag flag-turks-and-caicos-islands"></span></li>
-+  <li><span class="flag flag-tuvalu"></span></li>
-+  <li><span class="flag flag-uganda"></span></li>
-+  <li><span class="flag flag-ukraine"></span></li>
-+  <li><span class="flag flag-united-arab-emirates"></span></li>
-+  <li><span class="flag flag-united-kingdom"></span></li>
-+  <li><span class="flag flag-united-states-of-america"></span></li>
-+  <li><span class="flag flag-uruguay"></span></li>
-+  <li><span class="flag flag-us-virgin-islands"></span></li>
-+  <li><span class="flag flag-uzbekistan"></span></li>
-+  <li><span class="flag flag-vanuatu"></span></li>
-+  <li><span class="flag flag-vatican-city"></span></li>
-+  <li><span class="flag flag-venezuela"></span></li>
-+  <li><span class="flag flag-vietnam"></span></li>
-+  <li><span class="flag flag-wallis-and-futuna"></span></li>
-+  <li><span class="flag flag-western-sahara"></span></li>
-+  <li><span class="flag flag-yemen"></span></li>
-+  <li><span class="flag flag-zambia"></span></li>
-+  <li><span class="flag flag-zimbabwe"></span></li>
-+</ul>
-diff --git a/third_party/blink/web_tests/dark-mode/images/resources/country-flags-sprite.png b/third_party/blink/web_tests/dark-mode/images/resources/country-flags-sprite.png
-new file mode 100644
-index 000000000000..b2dbb8877c38
-Binary files /dev/null and b/third_party/blink/web_tests/dark-mode/images/resources/country-flags-sprite.png differ
-diff --git a/third_party/blink/web_tests/platform/mac-mac13/virtual/dark-mode-default/dark-mode/images/country-flags-expected.png b/third_party/blink/web_tests/platform/mac-mac13/virtual/dark-mode-default/dark-mode/images/country-flags-expected.png
-new file mode 100644
-index 000000000000..1b0fabc3ff77
-Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac13/virtual/dark-mode-default/dark-mode/images/country-flags-expected.png differ
-diff --git a/third_party/blink/web_tests/platform/mac/virtual/dark-mode-default/dark-mode/images/country-flags-expected.png b/third_party/blink/web_tests/platform/mac/virtual/dark-mode-default/dark-mode/images/country-flags-expected.png
-new file mode 100644
-index 000000000000..51c05fb642e7
-Binary files /dev/null and b/third_party/blink/web_tests/platform/mac/virtual/dark-mode-default/dark-mode/images/country-flags-expected.png differ
-diff --git a/third_party/blink/web_tests/platform/win/virtual/dark-mode-default/dark-mode/images/country-flags-expected.png b/third_party/blink/web_tests/platform/win/virtual/dark-mode-default/dark-mode/images/country-flags-expected.png
-new file mode 100644
-index 000000000000..1b0fabc3ff77
-Binary files /dev/null and b/third_party/blink/web_tests/platform/win/virtual/dark-mode-default/dark-mode/images/country-flags-expected.png differ
-diff --git a/third_party/blink/web_tests/platform/win11-arm64/virtual/dark-mode-default/dark-mode/images/country-flags-expected.png b/third_party/blink/web_tests/platform/win11-arm64/virtual/dark-mode-default/dark-mode/images/country-flags-expected.png
-new file mode 100644
-index 000000000000..51c05fb642e7
-Binary files /dev/null and b/third_party/blink/web_tests/platform/win11-arm64/virtual/dark-mode-default/dark-mode/images/country-flags-expected.png differ

diff --git a/chromium-148-Prefix-dark-mode-decision-tree-threshold-constants-with-kFeature.patch b/chromium-148-Prefix-dark-mode-decision-tree-threshold-constants-with-kFeature.patch
deleted file mode 100644
index f853057..0000000
--- a/chromium-148-Prefix-dark-mode-decision-tree-threshold-constants-with-kFeature.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-commit f60c4bb9d944849d3d9269a3f4c0782353c973ec
-Author: Prashant Nevase <pnevase@microsoft.com>
-Date:   Fri May 8 05:37:26 2026 -0700
-
-    Prefix dark mode decision-tree threshold constants with kFeature.
-    
-    This CL prefixes feature constants with kFeature to clearly
-    distinguish them from other constants, improving readability and
-    scalability as more features are getting added.
-    
-    Bug: 449909524
-    Change-Id: I84492594bead3e3b26a926933edfa11cbdba4c4b
-    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7831584
-    Commit-Queue: Stephen Chenney <schenney@chromium.org>
-    Reviewed-by: Stephen Chenney <schenney@chromium.org>
-    Auto-Submit: Prashant Nevase <pnevase@microsoft.com>
-    Cr-Commit-Position: refs/heads/main@{#1627580}
-
-diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-index 8151543ee33f..1d1b7fdf2348 100644
---- a/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-+++ b/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-@@ -17,23 +17,25 @@
- namespace blink {
- namespace {
- 
--// Decision tree lower and upper thresholds for grayscale and color images.
--constexpr std::array<float, 2> kLowColorCountThreshold = {0.8125, 0.015137};
--constexpr std::array<float, 2> kHighColorCountThreshold = {1, 0.025635};
--
-+const int kMaxSampledPixels = 1000;
-+const int kMaxBlocks = 10;
-+const float kMinOpaquePixelPercentageForForeground = 0.2;
- // Color is considered light if its luma is above this threshold.
- constexpr int kHighLightnessThreshold = 96;
- 
--// Luminance ratio threshold above which the image is classified as light.
--constexpr float kHighLuminanceThreshold = 0.5f;
-+// Decision tree thresholds for classifying images
-+
-+// Lower and upper color thresholds for grayscale and color images.
-+constexpr std::array<float, 2> kFeatureLowColorCountThreshold = {0.8125,
-+                                                                 0.015137};
-+constexpr std::array<float, 2> kFeatureHighColorCountThreshold = {1, 0.025635};
- 
- // Transparency ratio threshold above which the image is classified as
- // transparent, meaning most of the background pixels are transparent.
--constexpr float kTransparencyRatioThreshold = 0.4f;
-+constexpr float kFeatureTransparencyRatioThreshold = 0.4f;
- 
--const int kMaxSampledPixels = 1000;
--const int kMaxBlocks = 10;
--const float kMinOpaquePixelPercentageForForeground = 0.2;
-+// Luminance ratio threshold above which the image is classified as light.
-+constexpr float kFeatureHighLuminanceThreshold = 0.5f;
- 
- bool IsColorGray(const SkColor& color) {
-   return abs(static_cast<int>(SkColorGetR(color)) -
-@@ -288,20 +290,20 @@ DarkModeResult DarkModeImageClassifier::ClassifyUsingDecisionTree(
-   // foreground is predominantly light. Inverting such images would make
-   // visible pixels darker, causing them to merge with dark background, so do
-   // not apply filter.
--  if (features.transparency_ratio > kTransparencyRatioThreshold &&
--      features.high_luminance_ratio > kHighLuminanceThreshold) {
-+  if (features.transparency_ratio > kFeatureTransparencyRatioThreshold &&
-+      features.high_luminance_ratio > kFeatureHighLuminanceThreshold) {
-     return DarkModeResult::kDoNotApplyFilter;
-   }
- 
-   // Very few colors means it's not a photo, apply the filter.
-   if (features.color_buckets_ratio <
--      kLowColorCountThreshold[features.is_colorful]) {
-+      kFeatureLowColorCountThreshold[features.is_colorful]) {
-     return DarkModeResult::kApplyFilter;
-   }
- 
-   // Too many colors means it's probably photorealistic, do not apply it.
-   if (features.color_buckets_ratio >
--      kHighColorCountThreshold[features.is_colorful]) {
-+      kFeatureHighColorCountThreshold[features.is_colorful]) {
-     return DarkModeResult::kDoNotApplyFilter;
-   }
- 

diff --git a/chromium-149-Make-dark-mode-apply-filter-to-images-irrespective-of-layout-zoom.patch b/chromium-149-Make-dark-mode-apply-filter-to-images-irrespective-of-layout-zoom.patch
deleted file mode 100644
index 3e94092..0000000
--- a/chromium-149-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 1246f179f9b1..5b34283d7a55 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 f3eda0113391..9bf8df1c33a8 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 705a304de1ce..77ff0f069188 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-149-use-64px-css-pixels-absolute-threshold-for-dark-image-classification.patch b/chromium-149-use-64px-css-pixels-absolute-threshold-for-dark-image-classification.patch
deleted file mode 100644
index e05b32b..0000000
--- a/chromium-149-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 5b34283d7a55..658f6a4e4f6f 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 9bf8df1c33a8..afd57eee2b45 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 77ff0f069188..cf05ea1a9e8a 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-Add-AutoDarkModeSkipImages-flag-to-bypass-image-dark-mode.patch b/chromium-150-Add-AutoDarkModeSkipImages-flag-to-bypass-image-dark-mode.patch
new file mode 100644
index 0000000..34d3c6a
--- /dev/null
+++ b/chromium-150-Add-AutoDarkModeSkipImages-flag-to-bypass-image-dark-mode.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..61daa78
--- /dev/null
+++ b/chromium-150-Fix-get_path_info-on-empty-ar-in-unbundle-toolchain.patch
@@ -0,0 +1,32 @@
+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-Omit-ar-from-inputs-when-resolved-via-PATH.patch b/chromium-150-Omit-ar-from-inputs-when-resolved-via-PATH.patch
new file mode 100644
index 0000000..32c24c6
--- /dev/null
+++ b/chromium-150-Omit-ar-from-inputs-when-resolved-via-PATH.patch
@@ -0,0 +1,43 @@
+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-ffmpeg-AVDynamicHDRSmpte2094App5.patch b/chromium-150-ffmpeg-AVDynamicHDRSmpte2094App5.patch
new file mode 100644
index 0000000..6b98898
--- /dev/null
+++ b/chromium-150-ffmpeg-AVDynamicHDRSmpte2094App5.patch
@@ -0,0 +1,21 @@
+Workaround for missing AVDynamicHDRSmpte2094App5
+
+diff -up chromium-150.0.7871.46/media/filters/ffmpeg_demuxer.cc.me chromium-150.0.7871.46/media/filters/ffmpeg_demuxer.cc
+--- chromium-150.0.7871.46/media/filters/ffmpeg_demuxer.cc.me	2026-07-01 16:46:33.963059679 +0200
++++ chromium-150.0.7871.46/media/filters/ffmpeg_demuxer.cc	2026-07-01 17:02:31.668298287 +0200
+@@ -343,6 +343,7 @@ base::span<const uint8_t> GetMatroskaBlo
+ 
+ std::vector<uint8_t> GetAgtmSideData(const AVPacket* packet) {
+   std::vector<uint8_t> data;
++#ifdef AV_PKT_DATA_DYNAMIC_HDR_SMPTE_2094_APP5
+   size_t side_data_size = 0;
+   AVDynamicHDRSmpte2094App5* side_data =
+       reinterpret_cast<AVDynamicHDRSmpte2094App5*>(av_packet_get_side_data(
+@@ -360,6 +361,7 @@ std::vector<uint8_t> GetAgtmSideData(con
+       0) {
+     data.clear();
+   }
++#endif
+   return data;
+ }
+ 

diff --git a/chromium-150-sysroot.patch b/chromium-150-sysroot.patch
new file mode 100644
index 0000000..28c0782
--- /dev/null
+++ b/chromium-150-sysroot.patch
@@ -0,0 +1,27 @@
+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.spec b/chromium.spec
index 601dcf1..a4906f2 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -268,7 +268,7 @@
 %endif
 
 Name:	chromium
-Version: 149.0.7827.200
+Version: 150.0.7871.46
 Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
@@ -338,6 +338,8 @@ Patch135: chromium-133-disable-H.264-video-parser-during-demuxing.patch
 Patch136: chromium-133-workaround-system-ffmpeg-whitelist.patch
 # fatal error: 'third_party/ffmpeg/libavutil/rational.h' file not found
 Patch137: chromium-147-system-ffmpeg.patch
+# Workaround for missing AVDynamicHDRSmpte2094App5 in system ffmpeg
+Patch138: chromium-150-ffmpeg-AVDynamicHDRSmpte2094App5.patch
 # file conflict with old kernel on el8/el9
 Patch141: chromium-118-dma_buf_export_sync_file-conflict.patch
 # Fix FTBFS with rustc-1.88 on el9 and epel10.1
@@ -514,14 +516,11 @@ Patch520: build-with-wasm-rollup.patch
 Patch521: disable-ai.patch
 
 # Upstream patches
-# Fix auto dark mode
-Patch600: chromium-148-Add-luminance-ratio-feature-for-dark-mode-image-classification.patch
-Patch601: chromium-148-Prefix-dark-mode-decision-tree-threshold-constants-with-kFeature.patch
-Patch602: chromium-148-Add-saturation-feature-for-dark-mode-image-classification.patch
-Patch603: chromium-148-Add-AutoDarkModeSkipImages-flag-to-bypass-image-dark-mode.patch
-Patch604: chromium-148-Add-chromatic-pixels-feature-based-on-muted-hue-colors-for-dark-mode.patch
-Patch605: chromium-149-Make-dark-mode-apply-filter-to-images-irrespective-of-layout-zoom.patch
-Patch606: chromium-149-use-64px-css-pixels-absolute-threshold-for-dark-image-classification.patch
+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
 
 # Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
 # http://build.chromium.org/buildbot/official/
@@ -1101,8 +1100,9 @@ Qt6 UI for chromium.
 %patch -P132 -p1 -b .sigtrap_system_ffmpeg
 %patch -P135 -p1 -b .disable-H.264-video-parser-during-demuxing
 %patch -P136 -p1 -b .workaround-system-ffmpeg-whitelist
-%endif
 %patch -P137 -p1 -b .system-ffmpeg
+%patch -P138 -p1 -b .workaround-system-ffmpeg-AVDynamicHDRSmpte2094App5
+%endif
 
 %if 0%{?rhel} == 8 || 0%{?rhel} == 9
 %patch -P141 -p1 -b .dma_buf_export_sync_file-conflict
@@ -1234,14 +1234,11 @@ Qt6 UI for chromium.
 %patch -P521 -p1 -b .disable-ai
 
 # Upstream patches
-# improve auto dark image inversion logic
-%patch -P600 -p1 -b .Add-luminance-ratio-feature-for-dark-mode-image-classification
-%patch -P601 -p1 -b .Prefix-dark-mode-decision-tree-threshold-constants-with-kFeature
-%patch -P602 -p1 -b .Add-saturation-feature-for-dark-mode-image-classification
+%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 .Add-chromatic-pixels-feature-based-on-muted-hue-colors-for-dark-mode
-%patch -P605 -p1 -b .Make-dark-mode-apply-filter-to-images-irrespective-of-layout-zoom
-%patch -P606 -p1 -b .chromium-149-use-64px-css-pixels-absolute-threshold-for-dark-image-classification
 
 # Change shebang in all relevant files in this directory and all subdirectories
 # See `man find` for how the `-exec command {} +` syntax works
@@ -1916,6 +1913,395 @@ fi
 %endif
 
 %changelog
+* Wed Jul 01 2026 Than Ngo <than@redhat.com> - 150.0.7871.46-1
+- Update to 150.0.7871.46
+  * CVE-2026-13774: Use after free in Extensions
+  * CVE-2026-13775: Use after free in GPU
+  * CVE-2026-13776: Type Confusion in Dawn
+  * CVE-2026-13777: Insufficient validation of untrusted input in iOSWeb
+  * CVE-2026-13778: Use after free in WebUSB
+  * CVE-2026-13779: Use after free in Chromoting
+  * CVE-2026-13780: Insufficient validation of untrusted input in ANGLE
+  * CVE-2026-13781: Insufficient validation of untrusted input in Skia
+  * CVE-2026-13782: Use after free in Browser
+  * CVE-2026-13783: Use after free in Views
+  * CVE-2026-13784: Use after free in Views
+  * CVE-2026-13785: Use after free in Bluetooth
+  * CVE-2026-13786: Use after free in Ozone
+  * CVE-2026-13787: Use after free in Chromoting
+  * CVE-2026-13788: Use after free in Fullscreen
+  * CVE-2026-13789: Use after free in GPU
+  * CVE-2026-13790: Side-channel information leakage in Scroll
+  * CVE-2026-13791: Insufficient validation of untrusted input in Downloads
+  * CVE-2026-13792: Use after free in Touchbar
+  * CVE-2026-13793: Insufficient policy enforcement in SVG
+  * CVE-2026-13794: Insufficient validation of untrusted input in WebAppInstalls
+  * CVE-2026-13795: Insufficient policy enforcement in Chrome for iOS
+  * CVE-2026-13796: Integer overflow in Chromecast
+  * CVE-2026-13797: Insufficient validation of untrusted input in Chromecast
+  * CVE-2026-13798: Heap buffer overflow in Chromecast
+  * CVE-2026-13799: Use after free in QUIC
+  * CVE-2026-13800: Inappropriate implementation in Updater
+  * CVE-2026-13801: Integer overflow in Chromecast
+  * CVE-2026-13802: Use after free in Views
+  * CVE-2026-13803: Type Confusion in Chrome Tabs
+  * CVE-2026-13804: Use after free in Chromecast
+  * CVE-2026-13805: Use after free in GFX
+  * CVE-2026-13806: Insufficient validation of untrusted input in Accessibility
+  * CVE-2026-13807: Use after free in Import
+  * CVE-2026-13808: Insufficient data validation in Chrome for iOS
+  * CVE-2026-13809: Side-channel information leakage in Safe Browsing
+  * CVE-2026-13810: Inappropriate implementation in Input
+  * CVE-2026-13811: Use after free in IME
+  * CVE-2026-13812: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-13813: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-13814: Use after free in Views
+  * CVE-2026-13815: Use after free in Blink
+  * CVE-2026-13816: Insufficient validation of untrusted input in File Input
+  * CVE-2026-13817: Insufficient validation of untrusted input in Glic
+  * CVE-2026-13818: Inappropriate implementation in Passwords
+  * CVE-2026-13819: Out of bounds read in ANGLE
+  * CVE-2026-13820: Out of bounds read in Skia
+  * CVE-2026-13821: Use after free in Canvas
+  * CVE-2026-13822: Inappropriate implementation in Extensions
+  * CVE-2026-13823: Use after free in Glic
+  * CVE-2026-13824: Insufficient validation of untrusted input in Extensions
+  * CVE-2026-13825: Uninitialized Use in Dawn
+  * CVE-2026-13826: Inappropriate implementation in Autofill
+  * CVE-2026-13827: Use after free in Updater
+  * CVE-2026-13828: Inappropriate implementation in Enterprise
+  * CVE-2026-13829: Insufficient validation of untrusted input in Settings
+  * CVE-2026-13830: Use after free in Chromoting
+  * CVE-2026-13831: Use after free in GPU
+  * CVE-2026-13832: Use after free in Headless
+  * CVE-2026-13833: Uninitialized Use in ANGLE
+  * CVE-2026-13834: Insufficient validation of untrusted input in ANGLE
+  * CVE-2026-13835: Inappropriate implementation in XML
+  * CVE-2026-13836: Inappropriate implementation in CSS
+  * CVE-2026-13837: Inappropriate implementation in CSS
+  * CVE-2026-13838: Inappropriate implementation in CSS
+  * CVE-2026-13839: Inappropriate implementation in CSS
+  * CVE-2026-13840: Insufficient policy enforcement in Canvas
+  * CVE-2026-13841: Integer overflow in Skia
+  * CVE-2026-13842: Incorrect security UI in Chrome for iOS
+  * CVE-2026-13843: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-13844: Use after free in Updater
+  * CVE-2026-13845: Use after free in DOM
+  * CVE-2026-13846: Use after free in USB
+  * CVE-2026-13847: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-13848: Use after free in Forms
+  * CVE-2026-13849: Insufficient validation of untrusted input in Chromoting
+  * CVE-2026-13850: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-13851: Insufficient validation of untrusted input in WebAppInstalls
+  * CVE-2026-13852: Insufficient validation of untrusted input in WebAppInstalls
+  * CVE-2026-13853: Use after free in Journeys
+  * CVE-2026-13854: Use after free in Ozone
+  * CVE-2026-13855: Use after free in Ozone
+  * CVE-2026-13856: Insufficient validation of untrusted input in Speech
+  * CVE-2026-13857: Inappropriate implementation in Geometry
+  * CVE-2026-13858: Out of bounds read in FFmpeg
+  * CVE-2026-13859: Inappropriate implementation in ANGLE
+  * CVE-2026-13860: Incorrect security UI in Autofill
+  * CVE-2026-13861: Use after free in Core
+  * CVE-2026-13862: Insufficient policy enforcement in Web Authentication (Passkeys & Security Keys)
+  * CVE-2026-13863: Insufficient validation of untrusted input in CustomTabs
+  * CVE-2026-13864: Insufficient policy enforcement in WebHID
+  * CVE-2026-13865: Insufficient validation of untrusted input in Enterprise
+  * CVE-2026-13866: Insufficient validation of untrusted input in Input
+  * CVE-2026-13867: Inappropriate implementation in Geolocation
+  * CVE-2026-13868: Inappropriate implementation in Network
+  * CVE-2026-13869: Use after free in Device
+  * CVE-2026-13870: Use after free in WebView
+  * CVE-2026-13871: Insufficient data validation in GuestView
+  * CVE-2026-13872: Insufficient validation of untrusted input in WebAppInstalls
+  * CVE-2026-13873: Out of bounds memory access in Layout
+  * CVE-2026-13874: Inappropriate implementation in DataTransfer
+  * CVE-2026-13875: Insufficient validation of untrusted input in GPU
+  * CVE-2026-13876: Inappropriate implementation in Network
+  * CVE-2026-13877: Insufficient validation of untrusted input in ANGLE
+  * CVE-2026-13878: Use after free in Bluetooth
+  * CVE-2026-13879: Use after free in Bluetooth
+  * CVE-2026-13880: Use after free in USB
+  * CVE-2026-13881: Insufficient data validation in WebAppInstalls
+  * CVE-2026-13882: Inappropriate implementation in USB
+  * CVE-2026-13883: Type Confusion in ANGLE
+  * CVE-2026-13884: Heap buffer overflow in Chromecast
+  * CVE-2026-13885: Use after free in Skia
+  * CVE-2026-13886: Policy bypass in Isolated Web Apps
+  * CVE-2026-13887: Insufficient policy enforcement in NFC
+  * CVE-2026-13888: Use after free in Extensions
+  * CVE-2026-13889: Insufficient validation of untrusted input in WebAuthentication
+  * CVE-2026-13890: Out of bounds read in Chromecast
+  * CVE-2026-13891: Insufficient validation of untrusted input in Extensions
+  * CVE-2026-13892: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-13893: Insufficient validation of untrusted input in WebUI
+  * CVE-2026-13894: Insufficient policy enforcement in Network
+  * CVE-2026-13895: Inappropriate implementation in Autofill
+  * CVE-2026-13896: Insufficient policy enforcement in Glic
+  * CVE-2026-13897: Insufficient policy enforcement in Chromecast
+  * CVE-2026-13898: Use after free in Cast Receiver
+  * CVE-2026-13899: Use after free in HTML
+  * CVE-2026-13900: Insufficient validation of untrusted input in Chromecast
+  * CVE-2026-13901: Insufficient validation of untrusted input in Serial
+  * CVE-2026-13902: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-13903: Insufficient policy enforcement in Bluetooth
+  * CVE-2026-13904: Incorrect security UI in Safe Browsing
+  * CVE-2026-13905: Incorrect security UI in Chrome for iOS
+  * CVE-2026-13906: Out of bounds read in Codecs
+  * CVE-2026-13907: Inappropriate implementation in iOSWeb
+  * CVE-2026-13908: Insufficient validation of untrusted input in Omnibox
+  * CVE-2026-13909: Insufficient policy enforcement in DevTools
+  * CVE-2026-13910: Insufficient policy enforcement in WebXR
+  * CVE-2026-13911: Insufficient data validation in Spellcheck
+  * CVE-2026-13912: Incorrect security UI in Safe Browsing
+  * CVE-2026-13913: Insufficient policy enforcement in Autofill
+  * CVE-2026-13914: Inappropriate implementation in Passwords
+  * CVE-2026-13915: Use after free in Chrome for iOS
+  * CVE-2026-13916: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-13917: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-13918: Use after free in Chrome for iOS
+  * CVE-2026-13919: Insufficient data validation in Extensions
+  * CVE-2026-13920: Insufficient validation of untrusted input in Media
+  * CVE-2026-13921: Insufficient validation of untrusted input in DeviceBoundSessionCredentials
+  * CVE-2026-13922: Side-channel information leakage in Paint
+  * CVE-2026-13923: Uninitialized Use in GPU
+  * CVE-2026-13924: Insufficient validation of untrusted input in WebView
+  * CVE-2026-13925: Inappropriate implementation in Downloads
+  * CVE-2026-13926: Insufficient validation of untrusted input in Network
+  * CVE-2026-13927: Insufficient validation of untrusted input in UI
+  * CVE-2026-13928: Insufficient validation of untrusted input in Enterprise
+  * CVE-2026-13929: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-13930: Insufficient policy enforcement in Actor
+  * CVE-2026-13931: Inappropriate implementation in Media
+  * CVE-2026-13932: Inappropriate implementation in Sharing
+  * CVE-2026-13933: Insufficient policy enforcement in Passwords
+  * CVE-2026-13934: Insufficient validation of untrusted input in Dawn
+  * CVE-2026-13935: Side-channel information leakage in ComputePressure
+  * CVE-2026-13936: Inappropriate implementation in Passwords
+  * CVE-2026-13937: Insufficient policy enforcement in Passwords
+  * CVE-2026-13938: Integer overflow in Fonts
+  * CVE-2026-13939: Insufficient validation of untrusted input in WebShare
+  * CVE-2026-13940: Uninitialized Use in Cast
+  * CVE-2026-13941: Inappropriate implementation in SiteSettings
+  * CVE-2026-13942: Insufficient validation of untrusted input in Video Capture
+  * CVE-2026-13943: Uninitialized Use in CSS
+  * CVE-2026-13944: Inappropriate implementation in DataTransfer
+  * CVE-2026-13945: Insufficient policy enforcement in Extensions
+  * CVE-2026-13946: Inappropriate implementation in ScriptInjections
+  * CVE-2026-13947: Uninitialized Use in XR
+  * CVE-2026-13948: Insufficient policy enforcement in Extensions
+  * CVE-2026-13949: Insufficient policy enforcement in Payments
+  * CVE-2026-13950: Uninitialized Use in GPU
+  * CVE-2026-13951: Policy bypass in USB
+  * CVE-2026-13952: Inappropriate implementation in PerformanceAPIs
+  * CVE-2026-13953: Inappropriate implementation in SplitView
+  * CVE-2026-13954: Insufficient policy enforcement in XML
+  * CVE-2026-13955: Insufficient validation of untrusted input in CustomTabs
+  * CVE-2026-13956: Incorrect security UI in PageInfo
+  * CVE-2026-13957: Incorrect security UI in Extensions
+  * CVE-2026-13958: Uninitialized Use in Codecs
+  * CVE-2026-13959: Insufficient validation of untrusted input in Blink
+  * CVE-2026-13960: Inappropriate implementation in Passwords
+  * CVE-2026-13961: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-13962: Insufficient data validation in PDF
+  * CVE-2026-13963: Inappropriate implementation in DevTools
+  * CVE-2026-13964: Insufficient policy enforcement in WebView
+  * CVE-2026-13965: Use after free in Oilpan
+  * CVE-2026-13966: Inappropriate implementation in History
+  * CVE-2026-13967: Type Confusion in V8
+  * CVE-2026-13968: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-13969: Uninitialized Use in UI
+  * CVE-2026-13970: Uninitialized Use in Media
+  * CVE-2026-13971: Uninitialized Use in Skia
+  * CVE-2026-13972: Inappropriate implementation in Paint
+  * CVE-2026-13973: Inappropriate implementation in UI
+  * CVE-2026-13974: Integer overflow in Safe Browsing
+  * CVE-2026-13975: Out of bounds read in ANGLE
+  * CVE-2026-13976: Heap buffer overflow in Storage
+  * CVE-2026-13977: Inappropriate implementation in HTMLParser
+  * CVE-2026-13978: Insufficient policy enforcement in PageInfo
+  * CVE-2026-13979: Inappropriate implementation in Paint
+  * CVE-2026-13980: Incorrect security UI in Chrome for iOS
+  * CVE-2026-13981: Inappropriate implementation in Chrome for iOS
+  * CVE-2026-13982: Incorrect security UI in Passwords
+  * CVE-2026-13983: Incorrect security UI in Chrome for iOS
+  * CVE-2026-13984: Incorrect security UI in TabStrip
+  * CVE-2026-13985: Inappropriate implementation in MediaCapture
+  * CVE-2026-13986: Inappropriate implementation in Media UI
+  * CVE-2026-13987: Incorrect security UI in Mobile
+  * CVE-2026-13988: Inappropriate implementation in Paint
+  * CVE-2026-13989: Insufficient policy enforcement in PageInfo
+  * CVE-2026-13990: Insufficient validation of untrusted input in DataTransfer
+  * CVE-2026-13991: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-13992: Inappropriate implementation in UI
+  * CVE-2026-13993: Incorrect security UI in WebAppInstalls
+  * CVE-2026-13994: Inappropriate implementation in Credential Management
+  * CVE-2026-13995: Insufficient validation of untrusted input in Autofill
+  * CVE-2026-13996: Incorrect security UI in Permissions
+  * CVE-2026-13997: Incorrect security UI in Extensions
+  * CVE-2026-13998: Incorrect security UI in File Input
+  * CVE-2026-13999: Inappropriate implementation in Extensions
+  * CVE-2026-14000: Inappropriate implementation in XML
+  * CVE-2026-14001: Inappropriate implementation in Network
+  * CVE-2026-14002: Inappropriate implementation in Geolocation
+  * CVE-2026-14003: Insufficient policy enforcement in Extensions
+  * CVE-2026-14004: Inappropriate implementation in CSS
+  * CVE-2026-14005: Use after free in Omnibox
+  * CVE-2026-14006: Use after free in Navigation
+  * CVE-2026-14007: Insufficient policy enforcement in PermissionsPolicy
+  * CVE-2026-14008: Uninitialized Use in WebXR
+  * CVE-2026-14009: Insufficient data validation in Passwords
+  * CVE-2026-14010: Uninitialized Use in Codecs
+  * CVE-2026-14011: Out of bounds read in SurfaceCapture
+  * CVE-2026-14012: Side-channel information leakage in CSS
+  * CVE-2026-14013: Inappropriate implementation in SVG
+  * CVE-2026-14014: Inappropriate implementation in Paint
+  * CVE-2026-14015: Inappropriate implementation in WebRTC
+  * CVE-2026-14016: Insufficient policy enforcement in SVG
+  * CVE-2026-14017: Inappropriate implementation in Navigation
+  * CVE-2026-14018: Use after free in Updater
+  * CVE-2026-14019: Inappropriate implementation in Passwords
+  * CVE-2026-14020: Insufficient validation of untrusted input in WebXR
+  * CVE-2026-14021: Insufficient validation of untrusted input in StorageAccessAPI
+  * CVE-2026-14022: Insufficient validation of untrusted input in Network
+  * CVE-2026-14023: Insufficient validation of untrusted input in SanitizerAPI
+  * CVE-2026-14024: Use after free in Ozone
+  * CVE-2026-14025: Use after free in Views
+  * CVE-2026-14026: Incorrect security UI in SplitView
+  * CVE-2026-14027: Use after free in SignIn
+  * CVE-2026-14028: Incorrect security UI in Chrome for iOS
+  * CVE-2026-14030: Incorrect security UI in SplitView
+  * CVE-2026-14031: Incorrect security UI in File Input
+  * CVE-2026-14032: Use after free in Bluetooth
+  * CVE-2026-14033: Insufficient policy enforcement in Media
+  * CVE-2026-14034: Inappropriate implementation in WebXR
+  * CVE-2026-14035: Insufficient policy enforcement in Bluetooth
+  * CVE-2026-14036: Insufficient policy enforcement in Bluetooth
+  * CVE-2026-14037: Insufficient policy enforcement in GPU
+  * CVE-2026-14038: Insufficient validation of untrusted input in New Tab Page
+  * CVE-2026-14039: Insufficient policy enforcement in GetUserMedia
+  * CVE-2026-14040: Use after free in BrowserTag
+  * CVE-2026-14041: Insufficient policy enforcement in Serial
+  * CVE-2026-14042: Inappropriate implementation in Isolated Web Apps
+  * CVE-2026-14043: Use after free in GetUserMedia
+  * CVE-2026-14044: Use after free in ANGLE
+  * CVE-2026-14045: Insufficient validation of untrusted input in Network
+  * CVE-2026-14046: Inappropriate implementation in CustomTabs
+  * CVE-2026-14047: Insufficient policy enforcement in Extensions
+  * CVE-2026-14048: Use after free in Chromecast
+  * CVE-2026-14049: Inappropriate implementation in GPU
+  * CVE-2026-14050: Insufficient policy enforcement in Passwords
+  * CVE-2026-14051: Uninitialized Use in GamepadAPI
+  * CVE-2026-14052: Insufficient policy enforcement in FileSystem
+  * CVE-2026-14053: Insufficient policy enforcement in Extensions
+  * CVE-2026-14054: Insufficient policy enforcement in Network
+  * CVE-2026-14055: Insufficient validation of untrusted input in Device Trust
+  * CVE-2026-14056: Insufficient validation of untrusted input in Media
+  * CVE-2026-14057: Insufficient policy enforcement in FedCM
+  * CVE-2026-14058: Policy bypass in Parser
+  * CVE-2026-14059: Insufficient policy enforcement in Related-Website-Sets
+  * CVE-2026-14060: Insufficient validation of untrusted input in Chromoting
+  * CVE-2026-14061: Inappropriate implementation in Dawn
+  * CVE-2026-14062: Inappropriate implementation in Views
+  * CVE-2026-14063: Out of bounds memory access in Chromecast
+  * CVE-2026-14064: Use after free in PageInfo
+  * CVE-2026-14065: Insufficient validation of untrusted input in PageInfo
+  * CVE-2026-14066: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-14067: Use after free in Chrome for iOS
+  * CVE-2026-14068: Inappropriate implementation in Omnibox
+  * CVE-2026-14069: Integer overflow in WebNN
+  * CVE-2026-14070: Uninitialized Use in WebNN
+  * CVE-2026-14071: Side-channel information leakage in WebAudio
+  * CVE-2026-14072: Incorrect security UI in SplitView
+  * CVE-2026-14073: Insufficient policy enforcement in WebXR
+  * CVE-2026-14074: Side-channel information leakage in WebAuthentication
+  * CVE-2026-14075: Policy bypass in Chrome for iOS
+  * CVE-2026-14076: Policy bypass in Network
+  * CVE-2026-14077: Incorrect security UI in Select
+  * CVE-2026-14078: Policy bypass in WebRTC
+  * CVE-2026-14079: Policy bypass in Network
+  * CVE-2026-14080: Insufficient validation of untrusted input in TabSwitcher
+  * CVE-2026-14081: Insufficient policy enforcement in DevTools
+  * CVE-2026-14082: Race in Storage
+  * CVE-2026-14083: Insufficient validation of untrusted input in HTML
+  * CVE-2026-14084: Insufficient validation of untrusted input in Chromoting
+  * CVE-2026-14085: Side-channel information leakage in CSS
+  * CVE-2026-14086: Insufficient policy enforcement in HID
+  * CVE-2026-14087: Insufficient validation of untrusted input in WebNN
+  * CVE-2026-14088: Uninitialized Use in Canvas
+  * CVE-2026-14089: Insufficient validation of untrusted input in PopupBlocker
+  * CVE-2026-14090: Out of bounds read in CameraCapture
+  * CVE-2026-14091: Use after free in DevTools
+  * CVE-2026-14092: Insufficient policy enforcement in Privacy
+  * CVE-2026-14093: Use after free in Cast
+  * CVE-2026-14094: Use after free in Installer
+  * CVE-2026-14095: Insufficient validation of untrusted input in Browser
+  * CVE-2026-14096: Object lifecycle issue in Input
+  * CVE-2026-14097: Inappropriate implementation in WebAppInstalls
+  * CVE-2026-14098: Inappropriate implementation in CSS
+  * CVE-2026-14099: Use after free in Chrome for iOS
+  * CVE-2026-14100: Insufficient data validation in NetworkCache
+  * CVE-2026-14101: Insufficient policy enforcement in Sandbox
+  * CVE-2026-14102: Use after free in Passwords
+  * CVE-2026-14103: Use after free in SSL
+  * CVE-2026-14104: Insufficient validation of untrusted input in WebAppInstalls
+  * CVE-2026-14105: Insufficient policy enforcement in Speech
+  * CVE-2026-14106: Insufficient validation of untrusted input in Text
+  * CVE-2026-14107: Use after free in Scheduling
+  * CVE-2026-14108: Use after free in PDFium
+  * CVE-2026-14109: Insufficient policy enforcement in Mojo
+  * CVE-2026-14110: Inappropriate implementation in DarkMode
+  * CVE-2026-14111: Use after free in WebProtect
+  * CVE-2026-14112: Inappropriate implementation in Enterprise
+  * CVE-2026-14113: Use after free in Updater
+  * CVE-2026-14114: Inappropriate implementation in WebAppInstalls
+  * CVE-2026-14115: Insufficient validation of untrusted input in Cast
+  * CVE-2026-14116: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-14117: Insufficient validation of untrusted input in DevTools
+  * CVE-2026-14118: Insufficient data validation in DevTools
+  * CVE-2026-14119: Type Confusion in Bluetooth
+  * CVE-2026-14120: Inappropriate implementation in DevTools
+  * CVE-2026-14121: Use after free in Chromoting
+  * CVE-2026-14122: Insufficient validation of untrusted input in WebAppInstalls
+  * CVE-2026-14123: Incorrect security UI in Chrome for iOS
+  * CVE-2026-14124: Inappropriate implementation in CredentialProvider
+  * CVE-2026-14125: Uninitialized Use in ANGLE
+  * CVE-2026-14126: Incorrect security UI in UI
+  * CVE-2026-14127: Inappropriate implementation in Printing
+  * CVE-2026-14128: Insufficient data validation in Chrome for iOS
+  * CVE-2026-14129: Incorrect security UI in PreviewTab
+  * CVE-2026-14130: Incorrect security UI in Omnibox
+  * CVE-2026-14131: Insufficient validation of untrusted input in WebAppInstalls
+  * CVE-2026-14132: Inappropriate implementation in WebXR
+  * CVE-2026-14133: Race in History Embeddings
+  * CVE-2026-14134: Inappropriate implementation in Autofill
+  * CVE-2026-14135: Insufficient validation of untrusted input in Network
+  * CVE-2026-14136: Incorrect security UI in Chrome for iOS
+  * CVE-2026-14137: Insufficient validation of untrusted input in Chrome for iOS
+  * CVE-2026-14138: Inappropriate implementation in WebAppInstalls
+  * CVE-2026-14139: Inappropriate implementation in TabStrip
+  * CVE-2026-14140: Insufficient validation of untrusted input in Input
+  * CVE-2026-14141: Incorrect security UI in Document Picture-in-Picture
+  * CVE-2026-14142: Inappropriate implementation in Extensions
+  * CVE-2026-14143: Incorrect security UI in Passwords
+  * CVE-2026-14144: Incorrect security UI in Views
+  * CVE-2026-14145: Inappropriate implementation in CSS
+  * CVE-2026-14146: Inappropriate implementation in CSS
+  * CVE-2026-14147: Inappropriate implementation in CSS
+  * CVE-2026-14148: Type Confusion in CSS
+  * CVE-2026-14149: Use after free in Audio
+  * CVE-2026-14150: Insufficient validation of untrusted input in Speech
+  * CVE-2026-14151: Inappropriate implementation in AI
+  * CVE-2026-14152: Out of bounds write in ANGLE
+  * CVE-2026-14153: Inappropriate implementation in Glic
+  * CVE-2026-14154: Inappropriate implementation in DevTools
+  * CVE-2026-14155: Insufficient policy enforcement in StorageAccessAPI
+  * CVE-2026-14156: Policy bypass in StorageAccessAPI
+- Remove Darkmode patches, which are already included in v150
+- Refresh patches for v150
+- Fix FTBFS with system ffmpeg
+- Backport upstream patches to fix FTBFS
+
 * Fri Jun 26 2026 Than Ngo <than@redhat.com> - 149.0.7827.200-1
 - Update to 149.0.7827.200
    CVE-2026-13281: Integer overflow in Mojo

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

diff --git a/disable-ai.patch b/disable-ai.patch
index f0ca662..b18739b 100644
--- a/disable-ai.patch
+++ b/disable-ai.patch
@@ -1,9 +1,65 @@
 # Disable Glic ("Gemini Live in Chrome"), ScreenAI, and associated AI-based
 # features
 
-diff -up chromium-149.0.7827.53/chrome/browser/accessibility/BUILD.gn.me chromium-149.0.7827.53/chrome/browser/accessibility/BUILD.gn
---- chromium-149.0.7827.53/chrome/browser/accessibility/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/accessibility/BUILD.gn	2026-06-03 09:43:54.283607475 +0200
+--- a/chrome/browser/BUILD.gn
++++ b/chrome/browser/BUILD.gn
+@@ -2822,8 +2822,6 @@ static_library("browser") {
+       "//chrome/app:command_ids",
+       "//chrome/app/theme:chrome_unscaled_resources_grit",
+       "//chrome/app/vector_icons",
+-      "//chrome/browser/accessibility/tree_fixing:prefs",
+-      "//chrome/browser/accessibility/tree_fixing:service",
+       "//chrome/browser/accessibility_annotator/content_annotator",
+       "//chrome/browser/actor/ui",
+       "//chrome/browser/actor/ui:actor_overlay",
+@@ -2874,11 +2872,6 @@ static_library("browser") {
+       "//chrome/browser/profile_resetter:impl",
+       "//chrome/browser/record_replay",
+       "//chrome/browser/record_replay:impl",
+-      "//chrome/browser/screen_ai:prefs",
+-      "//chrome/browser/screen_ai:screen_ai_downloader",
+-      "//chrome/browser/screen_ai:screen_ai_install_state",
+-      "//chrome/browser/screen_ai:screen_ai_service_router_factory",
+-      "//chrome/browser/screen_ai/public:optical_character_recognizer",
+       "//chrome/browser/sharing/one_time_tokens",
+       "//chrome/browser/sharing_hub",
+       "//chrome/browser/sharing_hub:impl",
+@@ -2955,7 +2948,6 @@ static_library("browser") {
+       "//chrome/browser/ui/webui:webui_util",
+       "//chrome/browser/ui/webui/access_code_cast",
+       "//chrome/browser/ui/webui/app_service_internals",
+-      "//chrome/browser/ui/webui/autofill_ml_internals",
+       "//chrome/browser/ui/webui/color_pipeline_internals",
+       "//chrome/browser/ui/webui/commerce",
+       "//chrome/browser/ui/webui/commerce:impl",
+@@ -3066,9 +3058,6 @@ static_library("browser") {
+       "//components/webauthn/core/browser",
+       "//components/webauthn/core/browser:passkey_model",
+       "//services/device/public/cpp/hid",
+-      "//services/screen_ai",
+-      "//services/screen_ai/public/cpp:utilities",
+-      "//services/screen_ai/public/mojom",
+       "//third_party/crashpad/crashpad/client:common",
+       "//third_party/zxcvbn-cpp",
+       "//ui/views",
+@@ -3678,7 +3667,6 @@ static_library("browser") {
+       "//chrome/browser/policy:system_features_disable_list",
+       "//chrome/browser/push_notification",
+       "//chrome/browser/resources:app_icon_resources",
+-      "//chrome/browser/screen_ai:screen_ai_dlc_installer",
+       "//chrome/browser/sharesheet",
+       "//chrome/browser/sharesheet:impl",
+       "//chrome/browser/support_tool/ash",
+@@ -3942,7 +3930,6 @@ static_library("browser") {
+       "//remoting/host/chromeos:browser_interop",
+       "//remoting/host/chromeos:features",
+       "//services/device/public/cpp/geolocation",
+-      "//services/screen_ai/public/cpp:metrics",
+       "//third_party/nearby:rpc_resources_proto",
+       "//third_party/nearby:wire_format_proto",
+       "//ui/chromeos",
+--- a/chrome/browser/accessibility/BUILD.gn
++++ b/chrome/browser/accessibility/BUILD.gn
 @@ -58,7 +58,6 @@ source_set("accessibility") {
      public_deps += [
        "//chrome/browser/accessibility/live_caption",
@@ -40,10 +96,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/accessibility/BUILD.gn.me chromiu
  
      if (is_chromeos) {
        deps += [ "//chrome/browser/ash/accessibility:test_support" ]
-diff -up chromium-149.0.7827.53/chrome/browser/accessibility/live_caption/BUILD.gn.me chromium-149.0.7827.53/chrome/browser/accessibility/live_caption/BUILD.gn
---- chromium-149.0.7827.53/chrome/browser/accessibility/live_caption/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/accessibility/live_caption/BUILD.gn	2026-06-03 09:43:54.284000672 +0200
-@@ -46,7 +46,6 @@ source_set("impl") {
+--- a/chrome/browser/accessibility/live_caption/BUILD.gn
++++ b/chrome/browser/accessibility/live_caption/BUILD.gn
+@@ -44,7 +44,6 @@ source_set("impl") {
      "//chrome/browser/accessibility",
      "//chrome/browser/extensions",
      "//chrome/browser/on_device_translation",
@@ -51,9 +106,8 @@ diff -up chromium-149.0.7827.53/chrome/browser/accessibility/live_caption/BUILD.
      "//chrome/browser/ui",
      "//chrome/browser/ui/browser_window",
      "//components/live_caption",
-diff -up chromium-149.0.7827.53/chrome/browser/accessibility/tree_fixing/BUILD.gn.me chromium-149.0.7827.53/chrome/browser/accessibility/tree_fixing/BUILD.gn
---- chromium-149.0.7827.53/chrome/browser/accessibility/tree_fixing/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/accessibility/tree_fixing/BUILD.gn	2026-06-03 09:43:54.284292546 +0200
+--- a/chrome/browser/accessibility/tree_fixing/BUILD.gn
++++ b/chrome/browser/accessibility/tree_fixing/BUILD.gn
 @@ -63,11 +63,9 @@ source_set("internal") {
    deps = [
      "//base",
@@ -66,10 +120,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/accessibility/tree_fixing/BUILD.g
 -    "//services/screen_ai/public/mojom",
    ]
  }
-diff -up chromium-149.0.7827.53/chrome/browser/actor/actor_keyed_service.cc.me chromium-149.0.7827.53/chrome/browser/actor/actor_keyed_service.cc
---- chromium-149.0.7827.53/chrome/browser/actor/actor_keyed_service.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/actor/actor_keyed_service.cc	2026-06-03 09:43:54.284621901 +0200
-@@ -631,13 +631,6 @@ bool ActorKeyedService::IsActiveOnTab(co
+--- a/chrome/browser/actor/actor_keyed_service.cc
++++ b/chrome/browser/actor/actor_keyed_service.cc
+@@ -638,13 +638,6 @@ bool ActorKeyedService::IsActiveOnTab(co
  
  ActorTask* ActorKeyedService::GetTaskFromTab(
      const tabs::TabInterface& tab) const {
@@ -83,9 +136,8 @@ diff -up chromium-149.0.7827.53/chrome/browser/actor/actor_keyed_service.cc.me c
    return nullptr;
  }
  
-diff -up chromium-149.0.7827.53/chrome/browser/actor/ui/actor_ui_tab_controller.cc.me chromium-149.0.7827.53/chrome/browser/actor/ui/actor_ui_tab_controller.cc
---- chromium-149.0.7827.53/chrome/browser/actor/ui/actor_ui_tab_controller.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/actor/ui/actor_ui_tab_controller.cc	2026-06-03 09:43:54.285069160 +0200
+--- 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));
@@ -94,10 +146,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/actor/ui/actor_ui_tab_controller.
  }
  
  ActorUiTabController::~ActorUiTabController() = default;
-diff -up chromium-149.0.7827.53/chrome/browser/browser_process_impl.cc.me chromium-149.0.7827.53/chrome/browser/browser_process_impl.cc
---- chromium-149.0.7827.53/chrome/browser/browser_process_impl.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/browser_process_impl.cc	2026-06-03 09:43:54.285636016 +0200
-@@ -261,12 +261,10 @@ void OnLocalStatePrefsLoaded();
+--- a/chrome/browser/browser_process_impl.cc
++++ b/chrome/browser/browser_process_impl.cc
+@@ -260,12 +260,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"
@@ -110,7 +161,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/browser_process_impl.cc.me chromi
  #include "chrome/browser/usb/usb_status_icon.h"
  #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
  #endif
-@@ -1652,9 +1650,6 @@ void BrowserProcessImpl::PreMainMessageL
+@@ -1651,9 +1649,6 @@ void BrowserProcessImpl::PreMainMessageL
    soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -120,9 +171,8 @@ diff -up chromium-149.0.7827.53/chrome/browser/browser_process_impl.cc.me chromi
  
    base::FilePath user_data_dir;
    bool result = base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
-diff -up chromium-149.0.7827.53/chrome/browser/browser_process_impl.h.me chromium-149.0.7827.53/chrome/browser/browser_process_impl.h
---- chromium-149.0.7827.53/chrome/browser/browser_process_impl.h.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/browser_process_impl.h	2026-06-03 09:43:54.286136596 +0200
+--- a/chrome/browser/browser_process_impl.h
++++ b/chrome/browser/browser_process_impl.h
 @@ -95,9 +95,6 @@ namespace speech {
  class SodaInstaller;
  }  // namespace speech
@@ -133,7 +183,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/browser_process_impl.h.me chromiu
  
  namespace supervised_user {
  class DeviceParentalControls;
-@@ -461,9 +458,6 @@ class BrowserProcessImpl : public Browse
+@@ -460,9 +457,6 @@ class BrowserProcessImpl : public Browse
    // to ensure that SodaInstallerImpl gets destructed first.
    std::unique_ptr<speech::SodaInstaller> soda_installer_impl_;
  
@@ -143,77 +193,18 @@ diff -up chromium-149.0.7827.53/chrome/browser/browser_process_impl.h.me chromiu
  #endif
  
    std::unique_ptr<BrowserProcessPlatformPart> platform_part_;
-diff -up chromium-149.0.7827.53/chrome/browser/BUILD.gn.me chromium-149.0.7827.53/chrome/browser/BUILD.gn
---- chromium-149.0.7827.53/chrome/browser/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/BUILD.gn	2026-06-03 09:43:54.281074747 +0200
-@@ -2509,8 +2509,6 @@ static_library("browser") {
-       "//chrome/app:command_ids",
-       "//chrome/app/theme:chrome_unscaled_resources_grit",
-       "//chrome/app/vector_icons",
--      "//chrome/browser/accessibility/tree_fixing:prefs",
--      "//chrome/browser/accessibility/tree_fixing:service",
-       "//chrome/browser/accessibility_annotator/content_annotator",
-       "//chrome/browser/actor/ui",
-       "//chrome/browser/actor/ui:actor_overlay",
-@@ -2561,11 +2559,6 @@ static_library("browser") {
-       "//chrome/browser/profile_resetter:impl",
-       "//chrome/browser/record_replay",
-       "//chrome/browser/record_replay:impl",
--      "//chrome/browser/screen_ai:prefs",
--      "//chrome/browser/screen_ai:screen_ai_downloader",
--      "//chrome/browser/screen_ai:screen_ai_install_state",
--      "//chrome/browser/screen_ai:screen_ai_service_router_factory",
--      "//chrome/browser/screen_ai/public:optical_character_recognizer",
-       "//chrome/browser/sharing/one_time_tokens",
-       "//chrome/browser/sharing_hub",
-       "//chrome/browser/sharing_hub:impl",
-@@ -2643,7 +2636,6 @@ static_library("browser") {
-       "//chrome/browser/ui/webui:webui_util",
-       "//chrome/browser/ui/webui/access_code_cast",
-       "//chrome/browser/ui/webui/app_service_internals",
--      "//chrome/browser/ui/webui/autofill_ml_internals",
-       "//chrome/browser/ui/webui/color_pipeline_internals",
-       "//chrome/browser/ui/webui/commerce",
-       "//chrome/browser/ui/webui/commerce:impl",
-@@ -2750,9 +2742,6 @@ static_library("browser") {
-       "//components/webauthn/core/browser",
-       "//components/webauthn/core/browser:passkey_model",
-       "//services/device/public/cpp/hid",
--      "//services/screen_ai",
--      "//services/screen_ai/public/cpp:utilities",
--      "//services/screen_ai/public/mojom",
-       "//third_party/crashpad/crashpad/client:common",
-       "//third_party/zxcvbn-cpp",
-       "//ui/views",
-@@ -3390,7 +3379,6 @@ static_library("browser") {
-       "//chrome/browser/policy:system_features_disable_list",
-       "//chrome/browser/push_notification",
-       "//chrome/browser/resources:app_icon_resources",
--      "//chrome/browser/screen_ai:screen_ai_dlc_installer",
-       "//chrome/browser/sharesheet",
-       "//chrome/browser/sharesheet:impl",
-       "//chrome/browser/support_tool/ash",
-@@ -3655,7 +3643,6 @@ static_library("browser") {
-       "//remoting/host/chromeos:browser_interop",
-       "//remoting/host/chromeos:features",
-       "//services/device/public/cpp/geolocation",
--      "//services/screen_ai/public/cpp:metrics",
-       "//third_party/nearby:rpc_resources_proto",
-       "//third_party/nearby:wire_format_proto",
-       "//ui/chromeos",
-diff -up chromium-149.0.7827.53/chrome/browser/chrome_browser_interface_binders.cc.me chromium-149.0.7827.53/chrome/browser/chrome_browser_interface_binders.cc
---- chromium-149.0.7827.53/chrome/browser/chrome_browser_interface_binders.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/chrome_browser_interface_binders.cc	2026-06-03 09:43:54.286517860 +0200
+--- a/chrome/browser/chrome_browser_interface_binders.cc
++++ b/chrome/browser/chrome_browser_interface_binders.cc
 @@ -85,8 +85,6 @@
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
      BUILDFLAG(IS_CHROMEOS)
 -#include "chrome/browser/screen_ai/screen_ai_service_router.h"
 -#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
- #include "chrome/browser/web_applications/sub_apps_service_impl.h"
+ #include "chrome/browser/web_applications/sub_apps/sub_apps_service_impl.h"
  #endif
  
-@@ -373,27 +371,6 @@ void BindMediaFoundationPreferences(
+@@ -376,27 +374,6 @@ void BindMediaFoundationPreferences(
  }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -241,7 +232,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/chrome_browser_interface_binders.
  
  void BindModelBroker(
      content::RenderFrameHost* frame_host,
-@@ -558,10 +535,6 @@ void PopulateChromeFrameBinders(
+@@ -561,10 +538,6 @@ void PopulateChromeFrameBinders(
          &web_app::SubAppsServiceImpl::CreateIfAllowed);
    }
  
@@ -252,10 +243,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/chrome_browser_interface_binders.
  #endif
  
  #if BUILDFLAG(IS_WIN)
-diff -up chromium-149.0.7827.53/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc.me chromium-149.0.7827.53/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc
---- chromium-149.0.7827.53/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc	2026-06-03 09:43:54.286852795 +0200
-@@ -496,8 +496,6 @@ void PopulateChromeWebUIFrameBindersPart
+--- 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
        ::mojom::app_service_internals::AppServiceInternalsPageHandler,
        AppServiceInternalsUI>(map);
  
@@ -264,10 +254,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/chrome_browser_interface_binders_
  
    RegisterWebUIControllerInterfaceBinder<
        access_code_cast::mojom::PageHandlerFactory,
-diff -up chromium-149.0.7827.53/chrome/browser/component_updater/BUILD.gn.me chromium-149.0.7827.53/chrome/browser/component_updater/BUILD.gn
---- chromium-149.0.7827.53/chrome/browser/component_updater/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/component_updater/BUILD.gn	2026-06-03 09:43:54.287429630 +0200
-@@ -202,13 +202,6 @@ source_set("impl") {
+--- a/chrome/browser/component_updater/BUILD.gn
++++ b/chrome/browser/component_updater/BUILD.gn
+@@ -204,13 +204,6 @@ source_set("impl") {
      ]
    }
  
@@ -281,10 +270,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/component_updater/BUILD.gn.me chr
  
    if (use_minikin_hyphenation) {
      sources += [ "hyphenation_component_installer.cc" ]
-diff -up chromium-149.0.7827.53/chrome/browser/component_updater/registration.cc.me chromium-149.0.7827.53/chrome/browser/component_updater/registration.cc
---- chromium-149.0.7827.53/chrome/browser/component_updater/registration.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/component_updater/registration.cc	2026-06-03 09:43:54.287853335 +0200
-@@ -52,8 +52,6 @@
+--- a/chrome/browser/component_updater/registration.cc
++++ b/chrome/browser/component_updater/registration.cc
+@@ -53,8 +53,6 @@
  
  #if BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.h"
@@ -293,7 +281,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/component_updater/registration.cc
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if !BUILDFLAG(IS_ANDROID)
-@@ -200,9 +198,6 @@ void RegisterComponentsForUpdate() {
+@@ -201,9 +199,6 @@ void RegisterComponentsForUpdate() {
    RegisterRealTimeUrlChecksAllowlistComponent(cus);
  #endif  // BUIDLFLAG(IS_ANDROID)
  
@@ -303,19 +291,19 @@ diff -up chromium-149.0.7827.53/chrome/browser/component_updater/registration.cc
  
    RegisterCommerceHeuristicsComponent(cus);
  
-diff -up chromium-149.0.7827.53/chrome/browser/glic/host/glic_skills_manager_impl.cc.me chromium-149.0.7827.53/chrome/browser/glic/host/glic_skills_manager_impl.cc
---- chromium-149.0.7827.53/chrome/browser/glic/host/glic_skills_manager_impl.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/glic/host/glic_skills_manager_impl.cc	2026-06-03 09:43:54.288232825 +0200
-@@ -37,35 +37,6 @@ GlicSkillsManagerImpl::~GlicSkillsManage
+--- a/chrome/browser/glic/host/glic_skills_manager_impl.cc
++++ b/chrome/browser/glic/host/glic_skills_manager_impl.cc
+@@ -41,36 +41,6 @@ GlicSkillsManagerImpl::~GlicSkillsManage
  
  void GlicSkillsManagerImpl::UpdateSkillPreviews(
      std::optional<tabs::TabInterface*> updated_tab) {
--  if (!host_->IsWebClientConnected()) {
+-  if (!instance_->host().IsWebClientConnected()) {
 -    return;
 -  }
--  auto* focused_tab = host_->sharing_manager().GetFocusedTabData().focus();
+-  auto* focused_tab =
+-      instance_->host().sharing_manager().GetFocusedTabData().focus();
 -  if (!focused_tab) {
--    host_->NotifyContextualSkillsChanged({});
+-    instance_->host().NotifyContextualSkillsChanged({});
 -    contextual_skill_previews_.clear();
 -    return;
 -  }
@@ -338,13 +326,12 @@ diff -up chromium-149.0.7827.53/chrome/browser/glic/host/glic_skills_manager_imp
 -  for (const auto& preview : contextual_skill_previews_) {
 -    skill_previews.push_back(preview.Clone());
 -  }
--  host_->NotifyContextualSkillsChanged(std::move(skill_previews));
+-  instance_->host().NotifyContextualSkillsChanged(std::move(skill_previews));
  }
  
  tabs::TabInterface* GlicSkillsManagerImpl::EnsureTabForSkills() {
-diff -up chromium-149.0.7827.53/chrome/browser/navigation_predictor/navigation_predictor.cc.me chromium-149.0.7827.53/chrome/browser/navigation_predictor/navigation_predictor.cc
---- chromium-149.0.7827.53/chrome/browser/navigation_predictor/navigation_predictor.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/navigation_predictor/navigation_predictor.cc	2026-06-03 09:43:54.288737413 +0200
+--- a/chrome/browser/navigation_predictor/navigation_predictor.cc
++++ b/chrome/browser/navigation_predictor/navigation_predictor.cc
 @@ -18,8 +18,6 @@
  #include "base/time/default_tick_clock.h"
  #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service.h"
@@ -446,9 +433,8 @@ diff -up chromium-149.0.7827.53/chrome/browser/navigation_predictor/navigation_p
  }
  
  void NavigationPredictor::SetModelScoreCallbackForTesting(
-diff -up chromium-149.0.7827.53/chrome/browser/page_content_annotations/page_content_annotations_service_factory.cc.me chromium-149.0.7827.53/chrome/browser/page_content_annotations/page_content_annotations_service_factory.cc
---- chromium-149.0.7827.53/chrome/browser/page_content_annotations/page_content_annotations_service_factory.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/page_content_annotations/page_content_annotations_service_factory.cc	2026-06-03 09:43:54.289128626 +0200
+--- a/chrome/browser/page_content_annotations/page_content_annotations_service_factory.cc
++++ b/chrome/browser/page_content_annotations/page_content_annotations_service_factory.cc
 @@ -118,62 +118,6 @@ PageContentAnnotationsServiceFactory::~P
  std::unique_ptr<KeyedService>
  PageContentAnnotationsServiceFactory::BuildServiceInstanceForBrowserContext(
@@ -512,10 +498,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/page_content_annotations/page_con
    return nullptr;
  }
  
-diff -up chromium-149.0.7827.53/chrome/browser/password_manager/password_change_delegate_impl.cc.me chromium-149.0.7827.53/chrome/browser/password_manager/password_change_delegate_impl.cc
---- chromium-149.0.7827.53/chrome/browser/password_manager/password_change_delegate_impl.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/password_manager/password_change_delegate_impl.cc	2026-06-03 09:43:54.289486295 +0200
-@@ -337,16 +337,6 @@ void PasswordChangeDelegateImpl::StartPa
+--- a/chrome/browser/password_manager/password_change_delegate_impl.cc
++++ b/chrome/browser/password_manager/password_change_delegate_impl.cc
+@@ -328,12 +328,6 @@ void PasswordChangeDelegateImpl::StartPa
        base::BindRepeating(&PasswordChangeDelegateImpl::OnLoginStateCheckResult,
                            weak_ptr_factory_.GetWeakPtr()));
  
@@ -523,19 +508,14 @@ diff -up chromium-149.0.7827.53/chrome/browser/password_manager/password_change_
 -  // a local ML model for field classification.
 -  // TODO(452883239): Clean this up when model is downloaded on start-up for
 -  // everybody.
--  if (base::FeatureList::IsEnabled(
--          password_manager::features::
--              kProactivelyDownloadModelForPasswordChange)) {
--    PasswordFieldClassificationModelHandlerFactory::GetForBrowserContext(
--        originator_->GetBrowserContext());
--  }
+-  PasswordFieldClassificationModelHandlerFactory::GetForBrowserContext(
+-      originator_->GetBrowserContext());
  }
  
  void PasswordChangeDelegateImpl::OnLoginStateCheckResult(
-diff -up chromium-149.0.7827.53/chrome/browser/pdf/pdf_extension_util.cc.me chromium-149.0.7827.53/chrome/browser/pdf/pdf_extension_util.cc
---- chromium-149.0.7827.53/chrome/browser/pdf/pdf_extension_util.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/pdf/pdf_extension_util.cc	2026-06-03 09:43:54.289977627 +0200
-@@ -129,7 +129,6 @@ base::DictValue GetPdfViewerStrings() {
+--- a/chrome/browser/pdf/pdf_extension_util.cc
++++ b/chrome/browser/pdf/pdf_extension_util.cc
+@@ -138,7 +138,6 @@ base::DictValue GetPdfViewerStrings() {
        {"rotationStateLabel90", IDS_PDF_ROTATION_STATE_LABEL_90},
        {"rotationStateLabel180", IDS_PDF_ROTATION_STATE_LABEL_180},
        {"rotationStateLabel270", IDS_PDF_ROTATION_STATE_LABEL_270},
@@ -543,9 +523,8 @@ diff -up chromium-149.0.7827.53/chrome/browser/pdf/pdf_extension_util.cc.me chro
        {"sidebarLabel", IDS_PDF_SIDEBAR_LABEL},
        {"thumbnailPageAriaLabel", IDS_PDF_THUMBNAIL_PAGE_ARIA_LABEL},
        {"tooltipAttachments", IDS_PDF_TOOLTIP_ATTACHMENTS},
-diff -up chromium-149.0.7827.53/chrome/browser/permissions/BUILD.gn.me chromium-149.0.7827.53/chrome/browser/permissions/BUILD.gn
---- chromium-149.0.7827.53/chrome/browser/permissions/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/permissions/BUILD.gn	2026-06-03 09:43:54.290336799 +0200
+--- a/chrome/browser/permissions/BUILD.gn
++++ b/chrome/browser/permissions/BUILD.gn
 @@ -43,12 +43,6 @@ source_set("permissions") {
      "prediction_service/language_detection_observer.h",
      "prediction_service/passage_embedder_delegate.cc",
@@ -559,9 +538,8 @@ diff -up chromium-149.0.7827.53/chrome/browser/permissions/BUILD.gn.me chromium-
      "prediction_service/prediction_service_factory.cc",
      "prediction_service/prediction_service_factory.h",
      "prediction_service/prediction_service_request.cc",
-diff -up chromium-149.0.7827.53/chrome/browser/permissions/chrome_permissions_client.cc.me chromium-149.0.7827.53/chrome/browser/permissions/chrome_permissions_client.cc
---- chromium-149.0.7827.53/chrome/browser/permissions/chrome_permissions_client.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/permissions/chrome_permissions_client.cc	2026-06-03 09:43:54.290762678 +0200
+--- a/chrome/browser/permissions/chrome_permissions_client.cc
++++ b/chrome/browser/permissions/chrome_permissions_client.cc
 @@ -29,7 +29,6 @@
  #include "chrome/browser/permissions/permission_actions_history_factory.h"
  #include "chrome/browser/permissions/permission_decision_auto_blocker_factory.h"
@@ -570,7 +548,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/permissions/chrome_permissions_cl
  #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"
-@@ -476,8 +475,6 @@ ChromePermissionsClient::CreatePermissio
+@@ -501,8 +500,6 @@ ChromePermissionsClient::CreatePermissio
  #endif
    selectors.emplace_back(std::make_unique<PrefBasedQuietPermissionUiSelector>(
        Profile::FromBrowserContext(browser_context)));
@@ -579,7 +557,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/permissions/chrome_permissions_cl
    return selectors;
  }
  
-@@ -499,8 +496,6 @@ void ChromePermissionsClient::OnPromptRe
+@@ -524,8 +521,6 @@ void ChromePermissionsClient::OnPromptRe
  
    Profile* profile =
        Profile::FromBrowserContext(web_contents->GetBrowserContext());
@@ -588,9 +566,8 @@ diff -up chromium-149.0.7827.53/chrome/browser/permissions/chrome_permissions_cl
  
    if (request_type == permissions::RequestType::kNotifications) {
      if (action == permissions::PermissionAction::GRANTED &&
-diff -up chromium-149.0.7827.53/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc.me chromium-149.0.7827.53/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc
---- chromium-149.0.7827.53/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc	2026-06-03 09:43:54.291228652 +0200
+--- a/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc
++++ b/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc
 @@ -26,18 +26,6 @@ PassageEmbedderDelegate::PassageEmbedder
      : profile_(profile) {}
  
@@ -610,10 +587,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/permissions/prediction_service/pa
    PermissionUmaUtil::RecordPassageEmbedderMetadataValid(false);
    return nullptr;
  }
-diff -up chromium-149.0.7827.53/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc.me chromium-149.0.7827.53/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
---- chromium-149.0.7827.53/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc	2026-06-03 09:43:54.291546736 +0200
-@@ -798,7 +798,7 @@ void PermissionsAiUiSelector::ExecuteOnD
+--- a/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
++++ b/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc
+@@ -800,7 +800,7 @@ void PermissionsAiUiSelector::ExecuteOnD
      ModelExecutionData model_data) {
    VLOG(1) << "[PermissionsAI] ExecuteOnDeviceAivXModel";
    PredictionModelHandlerProvider* prediction_model_handler_provider =
@@ -622,10 +598,19 @@ diff -up chromium-149.0.7827.53/chrome/browser/permissions/prediction_service/pe
    if (prediction_model_handler_provider) {
      permissions::RequestType request_type =
          model_data.request_metadata.request_type;
-diff -up chromium-149.0.7827.53/chrome/browser/prefs/browser_prefs.cc.me chromium-149.0.7827.53/chrome/browser/prefs/browser_prefs.cc
---- chromium-149.0.7827.53/chrome/browser/prefs/browser_prefs.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/prefs/browser_prefs.cc	2026-06-03 09:43:54.292367323 +0200
-@@ -1664,9 +1664,6 @@ void RegisterLocalState(PrefRegistrySimp
+--- a/chrome/browser/prefs/BUILD.gn
++++ b/chrome/browser/prefs/BUILD.gn
+@@ -371,7 +371,6 @@ source_set("impl") {
+       "//chrome/browser/desktop_to_mobile_promos:utils",
+       "//chrome/browser/device_identity",
+       "//chrome/browser/new_tab_page",
+-      "//chrome/browser/screen_ai:prefs",
+       "//chrome/browser/search_engine_choice",
+       "//chrome/browser/search_engines",
+       "//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
    DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
  #endif
  
@@ -635,21 +620,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/prefs/browser_prefs.cc.me chromiu
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
    PlatformAuthPolicyObserver::RegisterPrefs(registry);
-diff -up chromium-149.0.7827.53/chrome/browser/prefs/BUILD.gn.me chromium-149.0.7827.53/chrome/browser/prefs/BUILD.gn
---- chromium-149.0.7827.53/chrome/browser/prefs/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/prefs/BUILD.gn	2026-06-03 09:43:54.291910256 +0200
-@@ -357,7 +357,6 @@ source_set("impl") {
-       "//chrome/browser/desktop_to_mobile_promos:utils",
-       "//chrome/browser/device_identity",
-       "//chrome/browser/new_tab_page",
--      "//chrome/browser/screen_ai:prefs",
-       "//chrome/browser/search_engine_choice",
-       "//chrome/browser/search_engines",
-       "//chrome/browser/sharing_hub",
-diff -up chromium-149.0.7827.53/chrome/browser/profiles/BUILD.gn.me chromium-149.0.7827.53/chrome/browser/profiles/BUILD.gn
---- chromium-149.0.7827.53/chrome/browser/profiles/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/profiles/BUILD.gn	2026-06-03 09:43:54.292830142 +0200
-@@ -783,7 +783,6 @@ source_set("profiles_extra_parts_impl")
+--- a/chrome/browser/profiles/BUILD.gn
++++ b/chrome/browser/profiles/BUILD.gn
+@@ -790,7 +790,6 @@ source_set("profiles_extra_parts_impl")
    } else {
      deps += [
        "//chrome/browser/accessibility/phrase_segmentation",
@@ -657,7 +630,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/profiles/BUILD.gn.me chromium-149
        "//chrome/browser/accessibility_annotator/content_annotator",
        "//chrome/browser/apps/app_service",
        "//chrome/browser/autofill",
-@@ -801,7 +800,6 @@ source_set("profiles_extra_parts_impl")
+@@ -808,7 +807,6 @@ source_set("profiles_extra_parts_impl")
        "//chrome/browser/profile_resetter",
        "//chrome/browser/record_replay",
        "//chrome/browser/record_replay:impl",
@@ -665,26 +638,25 @@ diff -up chromium-149.0.7827.53/chrome/browser/profiles/BUILD.gn.me chromium-149
        "//chrome/browser/search",
        "//chrome/browser/search_engine_choice",
        "//chrome/browser/sharing_hub",
-diff -up chromium-149.0.7827.53/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.me chromium-149.0.7827.53/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
---- chromium-149.0.7827.53/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc	2026-06-03 09:43:54.293236343 +0200
-@@ -137,7 +137,6 @@
+--- 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 @@
+ #include "chrome/browser/metrics/profile_metrics_service_factory.h"
  #include "chrome/browser/metrics/variations/google_groups_manager_factory.h"
- #include "chrome/browser/multistep_filter/core/multistep_filter_service_factory.h"
  #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
 -#include "chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.h"
  #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"
-@@ -374,7 +373,6 @@
- #include "chrome/browser/private_ai/private_ai_service_factory.h"
- #include "chrome/browser/profile_resetter/reset_report_uploader_factory.h"
- #include "chrome/browser/record_replay/recording_data_manager_factory.h"
+@@ -379,7 +378,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"
 -#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
  #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"
-@@ -1138,7 +1136,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1157,7 +1155,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
    net::ServerCertificateDatabaseServiceFactory::GetInstance();
  #endif
@@ -692,7 +664,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/profiles/chrome_browser_main_extr
  #if BUILDFLAG(ENABLE_DICE_SUPPORT)
    HistorySyncOptinServiceFactory::GetInstance();
    ProfileManagementDisclaimerServiceFactory::GetInstance();
-@@ -1189,9 +1186,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1208,9 +1205,6 @@ void ChromeBrowserMainExtraPartsProfiles
    // TODO(b/502297163): Implement for Android.
    OneTimePermissionsTrackerFactory::GetInstance();
  #endif
@@ -702,7 +674,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/profiles/chrome_browser_main_extr
    OptimizationGuideGlobalStateHolderKeyedServiceFactory::GetInstance();
    OptimizationGuideKeyedServiceFactory::GetInstance();
    OriginKeyedPermissionActionServiceFactory::GetInstance();
-@@ -1276,7 +1270,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1301,7 +1295,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
    policy::UserPolicyOidcSigninServiceFactory::GetInstance();
  #endif
@@ -710,7 +682,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/profiles/chrome_browser_main_extr
    PredictionServiceFactory::GetInstance();
    predictors::AutocompleteActionPredictorFactory::GetInstance();
    predictors::LoadingPredictorFactory::GetInstance();
-@@ -1355,10 +1348,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1382,10 +1375,6 @@ void ChromeBrowserMainExtraPartsProfiles
    SafetyHubMenuNotificationServiceFactory::GetInstance();
  #if !BUILDFLAG(IS_ANDROID)
    SafetyHubHatsServiceFactory::GetInstance();
@@ -721,7 +693,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/profiles/chrome_browser_main_extr
  #endif
  #if BUILDFLAG(IS_CHROMEOS)
    if (ash::features::IsScannerEnabled()) {
-@@ -1472,7 +1461,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1502,7 +1491,6 @@ void ChromeBrowserMainExtraPartsProfiles
    TopSitesFactory::GetInstance();
    translate::TranslateRankerFactory::GetInstance();
  #if !BUILDFLAG(IS_ANDROID)
@@ -729,10 +701,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/profiles/chrome_browser_main_extr
    TriggeredProfileResetterFactory::GetInstance();
  #endif
  #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
-diff -up chromium-149.0.7827.53/chrome/browser/profiles/off_the_record_profile_impl.cc.me chromium-149.0.7827.53/chrome/browser/profiles/off_the_record_profile_impl.cc
---- chromium-149.0.7827.53/chrome/browser/profiles/off_the_record_profile_impl.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/profiles/off_the_record_profile_impl.cc	2026-06-03 09:43:54.293599833 +0200
-@@ -220,11 +220,6 @@ void OffTheRecordProfileImpl::Init() {
+--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
++++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
+@@ -221,11 +221,6 @@ void OffTheRecordProfileImpl::Init() {
    // AccessibilityLabelsService has a default prefs behavior in incognito.
    AccessibilityLabelsService::InitOffTheRecordPrefs(this);
  
@@ -744,10 +715,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/profiles/off_the_record_profile_i
  
    // The ad service might not be available for some irregular profiles, like the
    // System Profile.
-diff -up chromium-149.0.7827.53/chrome/browser/profiles/profile_impl.cc.me chromium-149.0.7827.53/chrome/browser/profiles/profile_impl.cc
---- chromium-149.0.7827.53/chrome/browser/profiles/profile_impl.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/profiles/profile_impl.cc	2026-06-03 09:43:54.294053464 +0200
-@@ -861,11 +861,6 @@ void ProfileImpl::DoFinalInit(CreateMode
+--- a/chrome/browser/profiles/profile_impl.cc
++++ b/chrome/browser/profiles/profile_impl.cc
+@@ -902,11 +902,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);
@@ -759,9 +729,8 @@ diff -up chromium-149.0.7827.53/chrome/browser/profiles/profile_impl.cc.me chrom
  #endif  // BUILDFLAG(IS_ANDROID)
  
    // The announcement notification  service might not be available for some
-diff -up chromium-149.0.7827.53/chrome/browser/profiles/profile_manager.cc.me chromium-149.0.7827.53/chrome/browser/profiles/profile_manager.cc
---- chromium-149.0.7827.53/chrome/browser/profiles/profile_manager.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/profiles/profile_manager.cc	2026-06-03 09:43:54.294641160 +0200
+--- a/chrome/browser/profiles/profile_manager.cc
++++ b/chrome/browser/profiles/profile_manager.cc
 @@ -51,7 +51,6 @@
  #include "chrome/browser/buildflags.h"
  #include "chrome/browser/lifetime/application_lifetime.h"
@@ -770,7 +739,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/profiles/profile_manager.cc.me ch
  #include "chrome/browser/prefs/incognito_mode_prefs.h"
  #include "chrome/browser/profiles/delete_profile_helper.h"
  #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
-@@ -1625,9 +1624,6 @@ void ProfileManager::DoFinalInitForServi
+@@ -1621,9 +1620,6 @@ void ProfileManager::DoFinalInitForServi
    // Ensure NavigationPredictorKeyedService is started.
    NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
  
@@ -780,10 +749,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/profiles/profile_manager.cc.me ch
    IdentityManagerFactory::GetForProfile(profile)->OnNetworkInitialized();
    AccountReconcilorFactory::GetForProfile(profile);
  #if BUILDFLAG(IS_ANDROID)
-diff -up chromium-149.0.7827.53/chrome/browser/resources/pdf/pdf_viewer.html.me chromium-149.0.7827.53/chrome/browser/resources/pdf/pdf_viewer.html
---- chromium-149.0.7827.53/chrome/browser/resources/pdf/pdf_viewer.html.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/resources/pdf/pdf_viewer.html	2026-06-03 09:43:54.295131631 +0200
-@@ -106,10 +106,6 @@ import {AnnotationMode} from './constant
+--- a/chrome/browser/resources/pdf/pdf_viewer.html
++++ b/chrome/browser/resources/pdf/pdf_viewer.html
+@@ -103,10 +103,6 @@ import {AnnotationMode} from './constant
        </cr-page-selector>
      ` : ''}
    </if>
@@ -794,10 +762,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/resources/pdf/pdf_viewer.html.me 
  </div>
  
  ${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
-diff -up chromium-149.0.7827.53/chrome/browser/skills/BUILD.gn.me chromium-149.0.7827.53/chrome/browser/skills/BUILD.gn
---- chromium-149.0.7827.53/chrome/browser/skills/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/skills/BUILD.gn	2026-06-03 09:43:54.295664092 +0200
-@@ -59,13 +59,9 @@ source_set("public") {
+--- a/chrome/browser/skills/BUILD.gn
++++ b/chrome/browser/skills/BUILD.gn
+@@ -60,13 +60,9 @@ source_set("public") {
  source_set("ui") {
    sources = [
      "skills_dialog_launcher.cc",
@@ -811,10 +778,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/skills/BUILD.gn.me chromium-149.0
        "skills_ui_window_controller.cc",
      ]
    }
-diff -up chromium-149.0.7827.53/chrome/browser/ui/BUILD.gn.me chromium-149.0.7827.53/chrome/browser/ui/BUILD.gn
---- chromium-149.0.7827.53/chrome/browser/ui/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/ui/BUILD.gn	2026-06-03 09:43:54.296542669 +0200
-@@ -1744,8 +1744,6 @@ static_library("ui") {
+--- a/chrome/browser/ui/BUILD.gn
++++ b/chrome/browser/ui/BUILD.gn
+@@ -1540,8 +1540,6 @@ static_library("ui") {
        "//chrome/browser/regional_capabilities",
        "//chrome/browser/safe_browsing",
        "//chrome/browser/safe_browsing:advanced_protection",
@@ -823,7 +789,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/BUILD.gn.me chromium-149.0.782
        "//chrome/browser/smart_card",
        "//chrome/browser/support_tool",
        "//chrome/browser/tab_group_sync:utils",
-@@ -2600,7 +2598,6 @@ static_library("ui") {
+@@ -2399,7 +2397,6 @@ static_library("ui") {
        "//chrome/browser/policy:onc",
        "//chrome/browser/policy:system_features_disable_list",
        "//chrome/browser/push_notification",
@@ -831,7 +797,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/BUILD.gn.me chromium-149.0.782
        "//chrome/browser/ui/ash/app_access",
        "//chrome/browser/ui/ash/arc",
        "//chrome/browser/ui/ash/arc/arc_app_dialog_view",
-@@ -5031,7 +5028,6 @@ static_library("ui") {
+@@ -4762,7 +4759,6 @@ static_library("ui") {
        "//chrome/browser/ui/waap:waap_utils",
        "//chrome/browser/ui/webauthn:impl",
        "//chrome/browser/ui/webui/app_service_internals",
@@ -839,9 +805,8 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/BUILD.gn.me chromium-149.0.782
        "//chrome/browser/ui/webui/content_annotator_internals",
        "//chrome/browser/ui/webui/side_panel/customize_chrome",
        "//chrome/browser/ui/window_name_prompt",
-diff -up chromium-149.0.7827.53/chrome/browser/ui/pdf/BUILD.gn.me chromium-149.0.7827.53/chrome/browser/ui/pdf/BUILD.gn
---- chromium-149.0.7827.53/chrome/browser/ui/pdf/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/ui/pdf/BUILD.gn	2026-06-03 09:43:54.297018472 +0200
+--- a/chrome/browser/ui/pdf/BUILD.gn
++++ b/chrome/browser/ui/pdf/BUILD.gn
 @@ -6,7 +6,6 @@ import("//pdf/features.gni")
  import("//services/screen_ai/buildflags/features.gni")
  
@@ -858,9 +823,8 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/pdf/BUILD.gn.me chromium-149.0
      "//chrome/browser/ui/tab_contents",
      "//chrome/browser/ui/user_education",
      "//chrome/common",
-diff -up chromium-149.0.7827.53/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc.me chromium-149.0.7827.53/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
---- chromium-149.0.7827.53/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc	2026-06-03 09:43:54.297237448 +0200
+--- 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
    }
  }
@@ -884,9 +848,8 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/pdf/chrome_pdf_document_helper
 -  tab_subscriptions_.push_back(tab->RegisterWillDeactivate(
 -      base::BindRepeating(&MaybeHideSearchifyFeaturePromo)));
 -}
-diff -up chromium-149.0.7827.53/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h.me chromium-149.0.7827.53/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h
---- chromium-149.0.7827.53/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.h	2026-06-03 09:43:54.297407511 +0200
+--- 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
    void OnSaveURL() override;
    void SetPluginCanSave(content::RenderFrameHost* render_frame_host,
@@ -895,13 +858,38 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/pdf/chrome_pdf_document_helper
  
    // Holds subscriptions for TabInterface callbacks.
    std::vector<base::CallbackListSubscription> tab_subscriptions_;
-diff -up chromium-149.0.7827.53/chrome/browser/ui/tabs/tab_features.cc.me chromium-149.0.7827.53/chrome/browser/ui/tabs/tab_features.cc
---- chromium-149.0.7827.53/chrome/browser/ui/tabs/tab_features.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/ui/tabs/tab_features.cc	2026-06-03 09:43:54.297823230 +0200
-@@ -395,11 +395,6 @@ void TabFeatures::Init(TabInterface& tab
-     actor_tab_data_ =
-         GetUserDataFactory().CreateInstance<actor::ActorTabData>(tab, &tab);
+--- a/chrome/browser/ui/tabs/public/tab_features.h
++++ b/chrome/browser/ui/tabs/public/tab_features.h
+@@ -123,12 +123,6 @@ namespace permissions {
+ class PermissionIndicatorsTabData;
+ }  // namespace permissions
  
+-#if !BUILDFLAG(IS_ANDROID)
+-namespace skills {
+-class SkillsUpdateObserver;
+-}  // namespace skills
+-#endif  // !BUILDFLAG(IS_ANDROID)
+-
+ namespace sync_sessions {
+ class SyncSessionsRouterTabHelper;
+ }  // namespace sync_sessions
+@@ -565,10 +559,6 @@ class TabFeatures {
+   std::unique_ptr<contextual_tasks::ContextualTasksTabVisitTracker>
+       contextual_tasks_tab_visit_tracker_;
+ 
+-#if !BUILDFLAG(IS_ANDROID)
+-  std::unique_ptr<skills::SkillsUpdateObserver> skills_update_observer_;
+-#endif  //  !BUILDFLAG(IS_ANDROID)
+-
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+   std::unique_ptr<enterprise_reporting::SaasUsageNavigationObserver>
+       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
+           GetUserDataFactory().CreateInstance<actor::ui::ActorUiTabController>(
+               tab, tab, actor::ActorKeyedService::Get(profile));
+     }
 -    if (base::FeatureList::IsEnabled(features::kSkillsEnabled)) {
 -      skills_ui_tab_controller_ =
 -          GetUserDataFactory().CreateInstance<skills::SkillsUiTabController>(
@@ -910,7 +898,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/tabs/tab_features.cc.me chromi
  
      if (accessibility_annotator::
              ContentAnnotatorService* content_annotator_service =
-@@ -584,10 +579,6 @@ void TabFeatures::Init(TabInterface& tab
+@@ -612,10 +607,6 @@ void TabFeatures::Init(TabInterface& tab
  #endif
  
  #if !BUILDFLAG(IS_ANDROID)
@@ -921,10 +909,9 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/tabs/tab_features.cc.me chromi
    if (base::FeatureList::IsEnabled(features::kIndigo)) {
      indigo_page_action_controller_ =
          std::make_unique<indigo::IndigoPageActionController>(
-diff -up chromium-149.0.7827.53/chrome/browser/ui/views/user_education/browser_user_education_service.cc.me chromium-149.0.7827.53/chrome/browser/ui/views/user_education/browser_user_education_service.cc
---- chromium-149.0.7827.53/chrome/browser/ui/views/user_education/browser_user_education_service.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/ui/views/user_education/browser_user_education_service.cc	2026-06-03 09:43:54.298333469 +0200
-@@ -883,40 +883,6 @@ void MaybeRegisterChromeFeaturePromos(
+--- 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(
                         "Triggered when the PDF Viewer opens.")));
  #endif
  
@@ -965,31 +952,28 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/views/user_education/browser_u
  
    // kIPHLensOverlayFeature:
    registry.RegisterFeature(std::move(
-diff -up chromium-149.0.7827.53/chrome/browser/ui/webui/BUILD.gn.me chromium-149.0.7827.53/chrome/browser/ui/webui/BUILD.gn
---- chromium-149.0.7827.53/chrome/browser/ui/webui/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/ui/webui/BUILD.gn	2026-06-03 09:43:54.298669847 +0200
-@@ -83,7 +83,6 @@ source_set("configs") {
+--- a/chrome/browser/ui/webui/BUILD.gn
++++ b/chrome/browser/ui/webui/BUILD.gn
+@@ -116,7 +116,6 @@ source_set("configs") {
+       "//chrome/browser/glic/selection",
        "//chrome/browser/ui/webui/access_code_cast",
-       "//chrome/browser/ui/webui/accessibility_annotator",
        "//chrome/browser/ui/webui/app_service_internals",
 -      "//chrome/browser/ui/webui/autofill_ml_internals",
        "//chrome/browser/ui/webui/color_pipeline_internals",
        "//chrome/browser/ui/webui/content_annotator_internals",
        "//chrome/browser/ui/webui/data_sharing",
-diff -up chromium-149.0.7827.53/chrome/browser/ui/webui/chrome_web_ui_configs.cc.me chromium-149.0.7827.53/chrome/browser/ui/webui/chrome_web_ui_configs.cc
---- chromium-149.0.7827.53/chrome/browser/ui/webui/chrome_web_ui_configs.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/ui/webui/chrome_web_ui_configs.cc	2026-06-03 09:43:54.299017457 +0200
-@@ -334,7 +334,6 @@ void RegisterChromeWebUIConfigs() {
-           accessibility_annotator::info::AccessibilityAnnotatorInfoUIConfig>());
+--- 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() {
+   map.AddWebUIConfig(std::make_unique<media_router::AccessCodeCastUIConfig>());
    map.AddWebUIConfig(std::make_unique<actor::ui::ActorOverlayUIConfig>());
    map.AddWebUIConfig(std::make_unique<AppServiceInternalsUIConfig>());
 -  map.AddWebUIConfig(std::make_unique<AutofillMlInternalsUIConfig>());
    map.AddWebUIConfig(std::make_unique<BookmarksSidePanelUIConfig>());
    map.AddWebUIConfig(std::make_unique<BookmarksUIConfig>());
    map.AddWebUIConfig(std::make_unique<ColorPipelineInternalsUIConfig>());
-diff -up chromium-149.0.7827.53/chrome/browser/ui/webui/settings/accessibility_main_handler.cc.me chromium-149.0.7827.53/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
---- chromium-149.0.7827.53/chrome/browser/ui/webui/settings/accessibility_main_handler.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/ui/webui/settings/accessibility_main_handler.cc	2026-06-03 09:43:54.299740710 +0200
+--- a/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
++++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
 @@ -35,11 +35,6 @@ void AccessibilityMainHandler::RegisterM
        base::BindRepeating(
            &AccessibilityMainHandler::HandleCheckAccessibilityImageLabels,
@@ -1014,7 +998,7 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/webui/settings/accessibility_m
  }
  
  void AccessibilityMainHandler::OnJavascriptDisallowed() {
-@@ -62,35 +52,6 @@ void AccessibilityMainHandler::OnJavascr
+@@ -62,39 +52,6 @@ void AccessibilityMainHandler::OnJavascr
    accessibility_subscription_ = {};
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -1037,6 +1021,10 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/webui/settings/accessibility_m
 -  FireWebUIListener("screen-ai-state-changed", state_value);
 -}
 -
+-void AccessibilityMainHandler::OnScreenAIInstallStateDestroying() {
+-  component_ready_observer_.Reset();
+-}
+-
 -void AccessibilityMainHandler::HandleGetScreenAIInstallState(
 -    const base::ListValue& args) {
 -  CHECK_EQ(1U, args.size());
@@ -1050,9 +1038,8 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/webui/settings/accessibility_m
  }
  
  void AccessibilityMainHandler::HandleGetScreenReaderState(
-diff -up chromium-149.0.7827.53/chrome/browser/ui/webui/settings/accessibility_main_handler.h.me chromium-149.0.7827.53/chrome/browser/ui/webui/settings/accessibility_main_handler.h
---- chromium-149.0.7827.53/chrome/browser/ui/webui/settings/accessibility_main_handler.h.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/ui/webui/settings/accessibility_main_handler.h	2026-06-03 09:43:54.299979543 +0200
+--- a/chrome/browser/ui/webui/settings/accessibility_main_handler.h
++++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.h
 @@ -19,8 +19,7 @@ namespace settings {
  // Settings handler for the main accessibility settings page,
  // chrome://settings/accessibility.
@@ -1063,17 +1050,18 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/webui/settings/accessibility_m
   public:
    AccessibilityMainHandler();
    ~AccessibilityMainHandler() override;
-@@ -32,9 +31,6 @@ class AccessibilityMainHandler
+@@ -32,10 +31,6 @@ class AccessibilityMainHandler
    void OnJavascriptAllowed() override;
    void OnJavascriptDisallowed() override;
  
 -  // screen_ai::ScreenAIInstallState::Observer:
 -  void DownloadProgressChanged(double progress) override;
 -  void StateChanged(screen_ai::ScreenAIInstallState::State state) override;
+-  void OnScreenAIInstallStateDestroying() override;
  
   private:
    void HandleGetScreenReaderState(const base::ListValue& args);
-@@ -51,9 +47,6 @@ class AccessibilityMainHandler
+@@ -52,9 +47,6 @@ class AccessibilityMainHandler
    base::CallbackListSubscription accessibility_subscription_;
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -1083,9 +1071,8 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/webui/settings/accessibility_m
  };
  
  }  // namespace settings
-diff -up chromium-149.0.7827.53/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc.me chromium-149.0.7827.53/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
---- chromium-149.0.7827.53/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc	2026-06-03 09:43:54.300552160 +0200
+--- 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 @@
  #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
  #include "chrome/browser/language/language_model_manager_factory.h"
@@ -1110,11 +1097,10 @@ diff -up chromium-149.0.7827.53/chrome/browser/ui/webui/side_panel/read_anything
  
    if (features::IsReadAnythingWithReadabilityEnabled() &&
        !features::IsReadAnythingReadAloudPhraseHighlightingEnabled()) {
-diff -up chromium-149.0.7827.53/chrome/renderer/BUILD.gn.me chromium-149.0.7827.53/chrome/renderer/BUILD.gn
---- chromium-149.0.7827.53/chrome/renderer/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/renderer/BUILD.gn	2026-06-03 09:43:54.300944926 +0200
-@@ -349,8 +349,6 @@ static_library("renderer") {
-     ]
+--- a/chrome/renderer/BUILD.gn
++++ b/chrome/renderer/BUILD.gn
+@@ -328,8 +328,6 @@ static_library("renderer") {
+     deps += [ "//chrome/common/wallet:mojo_bindings" ]
    } else {
      sources += [
 -      "accessibility/ax_tree_distiller.cc",
@@ -1122,7 +1108,7 @@ diff -up chromium-149.0.7827.53/chrome/renderer/BUILD.gn.me chromium-149.0.7827.
        "accessibility/phrase_segmentation/base_phrase_segmenter.cc",
        "accessibility/phrase_segmentation/base_phrase_segmenter.h",
        "accessibility/phrase_segmentation/dependency_parser_model.cc",
-@@ -367,16 +365,6 @@ static_library("renderer") {
+@@ -346,16 +344,6 @@ static_library("renderer") {
        "accessibility/phrase_segmentation/tokenized_sentence.h",
        "accessibility/phrase_segmentation/tokenizer.cc",
        "accessibility/phrase_segmentation/tokenizer.h",
@@ -1139,7 +1125,7 @@ diff -up chromium-149.0.7827.53/chrome/renderer/BUILD.gn.me chromium-149.0.7827.
        "media/chrome_speech_recognition_client.cc",
        "media/chrome_speech_recognition_client.h",
        "searchbox/searchbox.cc",
-@@ -392,7 +380,6 @@ static_library("renderer") {
+@@ -371,7 +359,6 @@ static_library("renderer") {
        "//components/record_replay/content/renderer",
        "//components/trusted_vault",
        "//services/screen_ai/buildflags",
@@ -1147,10 +1133,9 @@ diff -up chromium-149.0.7827.53/chrome/renderer/BUILD.gn.me chromium-149.0.7827.
        "//services/strings",
        "//third_party/re2",
        "//third_party/tensorflow-text",
-diff -up chromium-149.0.7827.53/chrome/renderer/chrome_render_frame_observer.cc.me chromium-149.0.7827.53/chrome/renderer/chrome_render_frame_observer.cc
---- chromium-149.0.7827.53/chrome/renderer/chrome_render_frame_observer.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/renderer/chrome_render_frame_observer.cc	2026-06-03 09:43:54.301317153 +0200
-@@ -78,7 +78,6 @@
+--- a/chrome/renderer/chrome_render_frame_observer.cc
++++ b/chrome/renderer/chrome_render_frame_observer.cc
+@@ -79,7 +79,6 @@
  #include "url/gurl.h"
  
  #if !BUILDFLAG(IS_ANDROID)
@@ -1158,7 +1143,7 @@ diff -up chromium-149.0.7827.53/chrome/renderer/chrome_render_frame_observer.cc.
  #include "chrome/renderer/searchbox/searchbox_extension.h"
  #endif  // !BUILDFLAG(IS_ANDROID)
  
-@@ -341,14 +340,6 @@ void ChromeRenderFrameObserver::DidClear
+@@ -349,14 +348,6 @@ void ChromeRenderFrameObserver::DidClear
      SearchBoxExtension::Install(render_frame()->GetWebFrame());
    }
  
@@ -1173,10 +1158,9 @@ diff -up chromium-149.0.7827.53/chrome/renderer/chrome_render_frame_observer.cc.
  #endif  // !BUILDFLAG(IS_ANDROID)
  #if BUILDFLAG(ENABLE_GUEST_VIEW) && !BUILDFLAG(ENABLE_EXTENSIONS_CORE)
    guest_view::SlimWebViewBindings::MaybeInstall(*render_frame());
-diff -up chromium-149.0.7827.53/chrome/test/BUILD.gn.me chromium-149.0.7827.53/chrome/test/BUILD.gn
---- chromium-149.0.7827.53/chrome/test/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/test/BUILD.gn	2026-06-03 09:43:54.302075231 +0200
-@@ -2822,9 +2822,6 @@ if (!is_android) {
+--- a/chrome/test/BUILD.gn
++++ b/chrome/test/BUILD.gn
+@@ -2927,9 +2927,6 @@ if (!is_android) {
        "//chrome/browser/resource_coordinator:mojo_bindings",
        "//chrome/browser/safe_browsing:advanced_protection",
        "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
@@ -1186,7 +1170,7 @@ diff -up chromium-149.0.7827.53/chrome/test/BUILD.gn.me chromium-149.0.7827.53/c
        "//chrome/browser/search",
        "//chrome/browser/search_engines",
        "//chrome/browser/segmentation_platform:test_utils",
-@@ -3330,8 +3327,6 @@ if (!is_android) {
+@@ -3444,8 +3441,6 @@ if (!is_android) {
        "//services/preferences/public/cpp",
        "//services/preferences/public/cpp/tracked",
        "//services/preferences/tracked:features",
@@ -1195,25 +1179,24 @@ diff -up chromium-149.0.7827.53/chrome/test/BUILD.gn.me chromium-149.0.7827.53/c
        "//services/service_manager/public/cpp",
        "//services/strings",
        "//services/test/echo/public/mojom",
-@@ -8772,7 +8767,6 @@ test("unit_tests") {
-     #
-     # TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above?
+@@ -8926,7 +8921,6 @@ test("unit_tests") {
+     # TODO(crbug.com/417513088): Maybe merge with the non-android `deps`
+     # declaration above?
      deps += [
 -      "../browser/screen_ai:screen_ai_install_state",
        "//chrome:packed_resources",
        "//chrome/browser/apps:icon_standardizer",
        "//chrome/browser/apps/app_service",
-@@ -8810,7 +8804,6 @@ test("unit_tests") {
+@@ -8965,7 +8959,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/background:constants",
        "//chrome/browser/search_engine_choice:unit_tests",
-diff -up chromium-149.0.7827.53/chrome/utility/BUILD.gn.me chromium-149.0.7827.53/chrome/utility/BUILD.gn
---- chromium-149.0.7827.53/chrome/utility/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/utility/BUILD.gn	2026-06-03 09:43:54.303834070 +0200
+       "//chrome/browser/support_tool",
+--- a/chrome/utility/BUILD.gn
++++ b/chrome/utility/BUILD.gn
 @@ -147,7 +147,6 @@ static_library("utility") {
        "//components/user_data_importer/content",
        "//components/user_data_importer/utility:bookmarks",
@@ -1222,9 +1205,8 @@ diff -up chromium-149.0.7827.53/chrome/utility/BUILD.gn.me chromium-149.0.7827.5
      ]
    }
  
-diff -up chromium-149.0.7827.53/chrome/utility/services.cc.me chromium-149.0.7827.53/chrome/utility/services.cc
---- chromium-149.0.7827.53/chrome/utility/services.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/chrome/utility/services.cc	2026-06-03 09:43:54.304363986 +0200
+--- 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
  #include "services/proxy_resolver/proxy_resolver_factory_impl.h"  // nogncheck
@@ -1255,21 +1237,19 @@ diff -up chromium-149.0.7827.53/chrome/utility/services.cc.me chromium-149.0.782
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
-diff -up chromium-149.0.7827.53/components/autofill/core/browser/autofill_field.cc.me chromium-149.0.7827.53/components/autofill/core/browser/autofill_field.cc
---- chromium-149.0.7827.53/components/autofill/core/browser/autofill_field.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/components/autofill/core/browser/autofill_field.cc	2026-06-03 09:43:54.305384994 +0200
-@@ -25,7 +25,6 @@
- #include "components/autofill/core/browser/field_type_utils.h"
- #include "components/autofill/core/browser/field_types.h"
- #include "components/autofill/core/browser/heuristic_source.h"
--#include "components/autofill/core/browser/ml_model/field_classification_model_handler.h"
- #include "components/autofill/core/browser/proto/api_v1.pb.h"
- #include "components/autofill/core/browser/proto/server.pb.h"
- #include "components/autofill/core/common/autofill_constants.h"
-diff -up chromium-149.0.7827.53/components/autofill/core/browser/foundations/autofill_manager.cc.me chromium-149.0.7827.53/components/autofill/core/browser/foundations/autofill_manager.cc
---- chromium-149.0.7827.53/components/autofill/core/browser/foundations/autofill_manager.cc.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/components/autofill/core/browser/foundations/autofill_manager.cc	2026-06-03 09:43:54.305989973 +0200
-@@ -137,8 +137,6 @@ struct AutofillManager::AsyncContext {
+--- a/components/BUILD.gn
++++ b/components/BUILD.gn
+@@ -645,7 +645,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",
+-      "//components/permissions/prediction_service:unit_tests",
+       "//components/privacy_sandbox/privacy_sandbox_attestations:unit_tests",
+       "//components/safety_check:unit_tests",
+       "//components/security_interstitials/content:unit_tests",
+--- a/components/autofill/core/browser/foundations/autofill_manager.cc
++++ b/components/autofill/core/browser/foundations/autofill_manager.cc
+@@ -162,8 +162,6 @@ struct AutofillManager::AsyncContext {
  
    std::vector<FormData> forms;
    std::vector<RegexPredictions> regex_predictions;
@@ -1278,7 +1258,7 @@ diff -up chromium-149.0.7827.53/components/autofill/core/browser/foundations/aut
    GeoIpCountryCode country_code;
    LanguageCode current_page_language;
    std::unique_ptr<BufferingLogManager> log_manager;
-@@ -833,10 +831,8 @@ void AutofillManager::RunMlModels(
+@@ -849,10 +847,8 @@ void AutofillManager::RunMlModels(
                                     }));
          switch (source) {
            case HeuristicSource::kAutofillMachineLearning:
@@ -1289,7 +1269,7 @@ diff -up chromium-149.0.7827.53/components/autofill/core/browser/foundations/aut
              break;
            case HeuristicSource::kRegexes:
              NOTREACHED();
-@@ -1046,12 +1042,6 @@ void AutofillManager::UpdateFormCache(
+@@ -1061,12 +1057,6 @@ void AutofillManager::UpdateFormCache(
  
    auto apply_predictions = [](FormStructure& form_structure,
                                const AsyncContext& context, size_t i) {
@@ -1302,7 +1282,7 @@ diff -up chromium-149.0.7827.53/components/autofill/core/browser/foundations/aut
      if (!context.regex_predictions.empty()) {
        context.regex_predictions[i].ApplyTo(form_structure.fields());
      }
-@@ -1169,26 +1159,6 @@ void AutofillManager::LogCurrentFieldTyp
+@@ -1160,26 +1150,6 @@ void AutofillManager::LogCurrentFieldTyp
  
  void AutofillManager::SubscribeToMlModelChanges(
      FieldClassificationModelHandler& handler) {
@@ -1329,21 +1309,9 @@ diff -up chromium-149.0.7827.53/components/autofill/core/browser/foundations/aut
  }
  
  }  // namespace autofill
-diff -up chromium-149.0.7827.53/components/BUILD.gn.me chromium-149.0.7827.53/components/BUILD.gn
---- chromium-149.0.7827.53/components/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/components/BUILD.gn	2026-06-03 09:43:54.304778984 +0200
-@@ -639,7 +639,6 @@ test("components_unittests") {
-       "//components/one_time_tokens/core/browser:unit_tests",
-       "//components/page_info:unit_tests",
-       "//components/password_manager/core/browser/actor_login:unit_tests",
--      "//components/permissions/prediction_service:unit_tests",
-       "//components/privacy_sandbox/privacy_sandbox_attestations:unit_tests",
-       "//components/safety_check:unit_tests",
-       "//components/security_interstitials/content:unit_tests",
-diff -up chromium-149.0.7827.53/components/page_content_annotations/content/BUILD.gn.me chromium-149.0.7827.53/components/page_content_annotations/content/BUILD.gn
---- chromium-149.0.7827.53/components/page_content_annotations/content/BUILD.gn.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/components/page_content_annotations/content/BUILD.gn	2026-06-03 09:43:54.306298528 +0200
-@@ -57,8 +57,6 @@ source_set("page_embeddings") {
+--- a/components/page_content_annotations/content/BUILD.gn
++++ b/components/page_content_annotations/content/BUILD.gn
+@@ -72,8 +72,6 @@ source_set("page_embeddings") {
    sources = [
      "embeddings_candidate_generator.cc",
      "embeddings_candidate_generator.h",
@@ -1352,9 +1320,8 @@ diff -up chromium-149.0.7827.53/components/page_content_annotations/content/BUIL
      "page_embeddings_service.cc",
      "page_embeddings_service.h",
    ]
-diff -up chromium-149.0.7827.53/components/pdf/renderer/pdf_view_web_plugin_client.h.me chromium-149.0.7827.53/components/pdf/renderer/pdf_view_web_plugin_client.h
---- chromium-149.0.7827.53/components/pdf/renderer/pdf_view_web_plugin_client.h.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/components/pdf/renderer/pdf_view_web_plugin_client.h	2026-06-03 09:43:54.306719177 +0200
+--- a/components/pdf/renderer/pdf_view_web_plugin_client.h
++++ b/components/pdf/renderer/pdf_view_web_plugin_client.h
 @@ -12,7 +12,6 @@
  #include "base/memory/weak_ptr.h"
  #include "mojo/public/cpp/bindings/remote.h"
@@ -1372,21 +1339,8 @@ diff -up chromium-149.0.7827.53/components/pdf/renderer/pdf_view_web_plugin_clie
  
    base::WeakPtrFactory<PdfViewWebPluginClient> weak_factory_{this};
  };
-diff -up chromium-149.0.7827.53/remoting/host/setup/daemon_controller_delegate_linux_single_process.cc.me chromium-149.0.7827.53/remoting/host/setup/daemon_controller_delegate_linux_single_process.cc
---- chromium-149.0.7827.53/remoting/host/setup/daemon_controller_delegate_linux_single_process.cc.me	2026-05-31 10:23:00.560221979 +0200
-+++ chromium-149.0.7827.53/remoting/host/setup/daemon_controller_delegate_linux_single_process.cc	2026-05-31 11:05:04.796976105 +0200
-@@ -40,7 +40,7 @@ const char kDaemonDevScript[] = "remotin
- #endif  // NDEBUG
- 
- const char kDaemonScript[] =
--    "/opt/google/chrome-remote-desktop/chrome-remote-desktop";
-+    "%{crd_path}/chrome-remote-desktop";
- 
- // The name of the command-line switch used to specify the host configuration
- // file to use.
-diff -up chromium-149.0.7827.53/services/screen_ai/buildflags/features.gni.me chromium-149.0.7827.53/services/screen_ai/buildflags/features.gni
---- chromium-149.0.7827.53/services/screen_ai/buildflags/features.gni.me	2026-05-29 01:24:11.000000000 +0200
-+++ chromium-149.0.7827.53/services/screen_ai/buildflags/features.gni	2026-06-03 09:43:54.307138683 +0200
+--- a/services/screen_ai/buildflags/features.gni
++++ b/services/screen_ai/buildflags/features.gni
 @@ -6,15 +6,13 @@ import("//build/config/sanitizers/saniti
  
  declare_args() {

diff --git a/fix-breakpad-compile.patch b/fix-breakpad-compile.patch
index 7ad360b..abb4e57 100644
--- a/fix-breakpad-compile.patch
+++ b/fix-breakpad-compile.patch
@@ -1,8 +1,8 @@
-Index: chromium-144.0.7559.59/third_party/breakpad/BUILD.gn
+Index: chromium-150.0.7871.46/third_party/breakpad/BUILD.gn
 ===================================================================
---- chromium-144.0.7559.59.orig/third_party/breakpad/BUILD.gn
-+++ chromium-144.0.7559.59/third_party/breakpad/BUILD.gn
-@@ -804,7 +804,6 @@ if (is_linux || is_chromeos || is_androi
+--- chromium-150.0.7871.46.orig/third_party/breakpad/BUILD.gn
++++ chromium-150.0.7871.46/third_party/breakpad/BUILD.gn
+@@ -803,7 +803,6 @@ if (is_linux || is_chromeos || is_androi
        "breakpad/src/client/minidump_file_writer.h",
        "breakpad/src/common/convert_UTF.cc",
        "breakpad/src/common/convert_UTF.h",
@@ -10,16 +10,16 @@ Index: chromium-144.0.7559.59/third_party/breakpad/BUILD.gn
        "breakpad/src/common/linux/elf_core_dump.cc",
        "breakpad/src/common/linux/elf_core_dump.h",
        "breakpad/src/common/linux/elfutils.cc",
-@@ -836,6 +835,8 @@ if (is_linux || is_chromeos || is_androi
+@@ -835,6 +834,8 @@ if (is_linux || is_chromeos || is_androi
      configs += [ "//build/config/compiler:no_chromium_code" ]
      public_configs = [ ":client_config" ]
  
 +    defines = [ "HAVE_GETCONTEXT" ]
 +
-     if (current_cpu == "arm" && is_chromeos_ash) {
+     if (current_cpu == "arm" && is_chromeos) {
        # Avoid running out of registers in
        # linux_syscall_support.h:sys_clone()'s inline assembly.
-@@ -893,7 +894,6 @@ if (is_linux || is_chromeos || is_androi
+@@ -892,7 +893,6 @@ if (is_linux || is_chromeos || is_androi
        "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
        "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
        "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",

diff --git a/fix-rust-linking.patch b/fix-rust-linking.patch
index dca5333..d0eec02 100644
--- a/fix-rust-linking.patch
+++ b/fix-rust-linking.patch
@@ -1,34 +1,60 @@
-Index: chromium-144.0.7559.59/build/toolchain/gcc_toolchain.gni
+Index: chromium-150.0.7871.46/build/toolchain/gcc_toolchain.gni
 ===================================================================
---- chromium-144.0.7559.59.orig/build/toolchain/gcc_toolchain.gni
-+++ chromium-144.0.7559.59/build/toolchain/gcc_toolchain.gni
-@@ -415,7 +415,13 @@ template("single_gcc_toolchain") {
-         # -soname flag is not available on aix ld
-         soname_flag = "-Wl,-soname=\"$soname\""
+--- chromium-150.0.7871.46.orig/build/toolchain/gcc_toolchain.gni
++++ chromium-150.0.7871.46/build/toolchain/gcc_toolchain.gni
+@@ -457,13 +457,25 @@ template("single_gcc_toolchain") {
+       } else {
+         main_so_file = sofile_with_symbols
        }
--      link_command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\" {{rlibs}}"
+-      link_command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$main_so_file\" "
 +      if (target_cpu == "ppc64") {
 +        # Work around linker failures due to Rust libraries and the use of whole-archive
-+        link_command = "$ld -shared $soname_flag -Wl,--start-group {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\" {{rlibs}} -Wl,--end-group"
++        link_command = "$ld -shared $soname_flag -Wl,--start-group {{ldflags}}${extra_ldflags} -o \"$main_so_file\" "
 +      }
 +      else {
-+        link_command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\" {{rlibs}}"
++        link_command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$main_so_file\" "
++      }
+ 
+       if (use_mold_separate_debug_file) {
+         # TODO(40208899): See if it adding --detach for local builds helps.
+         link_command += "\"-Wl,--separate-debug-file=$sofile_with_symbols\" -Wl,--no-detach "
+       }
+-      link_command += "@\"$rspfile\" {{rlibs}}"
++      if (target_cpu == "ppc64") {
++        # Work around linker failures due to Rust libraries and the use of whole-archiv
++        link_command += "@\"$rspfile\" {{rlibs}}  -Wl,--end-group"
++      }
++      else {
++        link_command += "@\"$rspfile\" {{rlibs}}"
 +      }
  
        # Generate a map file to be used for binary size analysis.
        # Map file adds ~10% to the link time on a z620.
-@@ -527,7 +533,13 @@ template("single_gcc_toolchain") {
-         whole_archive_flag = "-Wl,--whole-archive"
-         no_whole_archive_flag = "-Wl,--no-whole-archive"
+@@ -575,13 +587,25 @@ template("single_gcc_toolchain") {
+       } else {
+         main_so_file = sofile_with_symbols
+       }
+-      command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$main_so_file\" "
++      if (target_cpu == "ppc64") {
++        # Work around linker failures due to Rust libraries and the use of whole-archive
++        command = "$ld -shared -Wl,--start-group $soname_flag {{ldflags}}${extra_ldflags} -o \"$main_so_file\" "
++      }
++      else {
++        command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$main_so_file\" "
++      }
+ 
+       if (use_mold_separate_debug_file) {
+         # TODO(40208899): See if it adding --detach for local builds helps.
+         command += "\"-Wl,--separate-debug-file=$sofile_with_symbols\" -Wl,--no-detach "
        }
--      command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" $soname_flag @\"$rspfile\""
+-      command += "@\"$rspfile\" {{rlibs}}"
 +      if (target_cpu == "ppc64") {
 +        # Work around linker failures due to Rust libraries and the use of whole-archive
-+        command = "$ld -shared -Wl,--start-group {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" $soname_flag @\"$rspfile\" -Wl,--end-group"
++        command += "@\"$rspfile\" -Wl,--end-group {{rlibs}}"
 +      }
 +      else {
-+        command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" $soname_flag @\"$rspfile\""
++        command += "@\"$rspfile\" {{rlibs}}"
 +      }
  
-       if (defined(invoker.strip)) {
-         strip_command = "${invoker.strip} -o \"$sofile\" \"$unstripped_sofile\""
+       if (defined(invoker.strip) && !use_mold_separate_debug_file) {
+         strip_command =

diff --git a/sources b/sources
index 7e626b7..d97a39d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (node-v22.22.0-stripped.tar.gz) = f32a8a73063b3c78cbacf941e11dd529ebcf2618b3ba661966312e49ee9870c43a3acf256e8d331a4b0b621b16a501810c02a3ad763c75884cc250addca8e106
-SHA512 (chromium-149.0.7827.200-clean.tar.xz) = c50369338acb17a53a53c6501a823c584040955b2162730ca8a0f5ea75d4fde2300c7424fac7cb5f6c41c26ecd9c55d91a190a536a5639b59cbaf4f0458cde85
+SHA512 (chromium-150.0.7871.46-clean.tar.xz) = 3c7eb145084cb37a45ce0a5d376e422d47c879518bdffd46c68da35e70132d6b529d68bfba3fee684fbe08e557105933fbc28daad2df432b4552932eb436d4b7